Dockerfile: update syntax, switch to bullseye, add missing libseccomp-dev, remove build pack by thaJeztah · Pull Request #42763 · moby/moby

thaJeztah · 2021-08-19T22:01:49Z

So, this started with the intention to "just" update buster to bullseye, but finding various issues that needed fixing, or could be improved.

Dockerfile: update to docker/dockerfile:1.3, and remove temporary fix.

I saw we were using an older syntax, and the issue I reported (moby/buildkit#2114) was fixed in dockerfile:1.3 front-end, so upgrading allowed me to remove the temporary fix.

Dockerfile: remove aufs-tools, as it's not available on bullseye

Well, title says all. No more aufs?

Dockerfile: update to debian bullseye

Well, that's what I came here for 😂

Dockerfile: add back libseccomp-dev to cross-compile runc

Commit 7168d98 removed these, but I think we overlooked that the same stage is used to build runc as well, so we likely need these. (but happy to remove if we really don't need them!)

Dockerfile: frozen images: update to bullseye, remove buildpack-dep

Update the frozen images to also be based on Debian bullseye. Using the "slim" variant (which looks to have all we're currently using), and remove the buildpack-dep frozen image.

The buildpack-dep image is quite large, and it looks like we only use it to compile some C binaries, which should work fine on a regular debian image;

docker build -t debian:bullseye-slim-gcc -<<EOF
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends
EOF

docker image ls

REPOSITORY        TAG                 IMAGE ID       CREATED          SIZE
debian            bullseye-slim-gcc   1851750242af   About a minute ago   255MB
buildpack-deps    bullseye            fe8fece98de2   2 days ago           834MB

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah · 2021-08-19T22:14:32Z

integration/build/build_userns_linux_test.go

Looks like setcap was removed from bullseye at some point;

docker run --rm debian:bullseye@sha256:7190e972ab16aefea4d758ebe42a293f4e5c5be63595f4d03a5b9bf6839a4344 sh -c 'setcap CAP_NET_BIND_SERVICE=+eip /bin/sleep' docker run --rm debian:bullseye sh -c 'setcap CAP_NET_BIND_SERVICE=+eip /bin/sleep' sh: 1: setcap: not found

thaJeztah · 2021-08-19T23:04:38Z

Arf.. output format changed of getcap;

archive_unix_test.go:288: assertion failed: string "/tmp/docker-test-untar-origin629714680/2 cap_block_suspend=ep\n" does not contain "= cap_block_suspend+ep": untar should have kept the 'security.capability' xattr

thaJeztah · 2021-08-19T23:57:13Z

Ahm... needs some more tests to be updated;

=== RUN   TestDaemonDefaultNetworkPools
    service_test.go:23: assertion failed:
        Command:  ip link delete docker0
        ExitCode: 127
        Error:    exec: "ip": executable file not found in $PATH
        Stdout:
        Stderr:

        Failures:
        ExitCode was 127 expected 0
        Expected no error

=== RUN   TestDaemonRestartWithExistingNetwork
    service_test.go:23: assertion failed: 
        Command:  ip link delete docker0
        ExitCode: 127
        Error:    exec: "ip": executable file not found in $PATH
        Stdout:   
        Stderr:   
        
        Failures:
        ExitCode was 127 expected 0
        Expected no error

thaJeztah · 2021-08-20T11:32:35Z

Getting close now; only one related failure;

=== RUN   TestDockerSuite/TestAPIStatsNetworkStats
    docker_api_stats_test.go:145: assertion failed: error is not nil: exec: "ping": executable file not found in $PATH
    --- FAIL: TestDockerSuite/TestAPIStatsNetworkStats (1.75s)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Otherwise errors within this function will all show to be at the line number of the utility, instead of where it failed in the test: === RUN TestDaemonDefaultNetworkPools service_test.go:23: assertion failed: Command: ip link delete docker0 ExitCode: 127 Error: exec: "ip": executable file not found in $PATH Stdout: Stderr: Failures: ExitCode was 127 expected 0 Expected no error === RUN TestDaemonRestartWithExistingNetwork service_test.go:23: assertion failed: Command: ip link delete docker0 ExitCode: 127 Error: exec: "ip": executable file not found in $PATH Stdout: Stderr: Failures: ExitCode was 127 expected 0 Expected no error Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

tianon · 2021-08-20T15:51:20Z

Dockerfile

Suggested change

inetutils-ping\

inetutils-ping \

👀

tianon · 2021-08-20T15:51:43Z

Dockerfile.e2e

Suggested change

inetutils-ping\

inetutils-ping \

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

commit 7168d98 removed these, but we overlooked that the same stage is used to build runc as well, so we likely need these. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Update the frozen images to also be based on Debian bullseye. Using the "slim" variant (which looks to have all we're currently using), and remove the buildpack-dep frozen image. The buildpack-dep image is quite large, and it looks like we only use it to compile some C binaries, which should work fine on a regular debian image; docker build -t debian:bullseye-slim-gcc -<<EOF FROM debian:bullseye-slim RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends EOF docker image ls REPOSITORY TAG IMAGE ID CREATED SIZE debian bullseye-slim-gcc 1851750242af About a minute ago 255MB buildpack-deps bullseye fe8fece98de2 2 days ago 834MB Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2021-08-20T16:23:58Z

@tianon fixed; PTAL

thaJeztah · 2021-08-20T21:27:07Z

New flaky test? ("interesting" error)

=== RUN   TestServicePlugin
    plugin_test.go:50: assertion failed: error is not nil: Error response from daemon: content sha256:fc6183ae6e37a7808e1ee317bb5d513b52d0053577e973606e9725f26135ac7d: already exists
--- FAIL: TestServicePlugin (2.09s)

tianon · 2021-08-21T00:16:00Z

Dockerfile

    --mount=type=cache,sharing=locked,id=moby-criu-aptcache,target=/var/cache/apt \
-        chmod 0644 /etc/apt/trusted.gpg.d/criu.gpg.asc \
-        && echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/ /' > /etc/apt/sources.list.d/criu.list \
+        echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/ /' > /etc/apt/sources.list.d/criu.list \


Should we add something like TODO update to Debian_11 or just not worry about it? (It's probably fine.)

I'm hoping @kolyshkin will remind me at that time; opencontainers/runc#3171 (comment) 😁

thaJeztah · 2021-08-22T10:56:50Z

@AkihiroSuda @cpuguy83 PTAL

thaJeztah added status/2-code-review area/testing area/packaging labels Aug 19, 2021

thaJeztah added this to the 21.xx milestone Aug 19, 2021

thaJeztah force-pushed the go_ branch from 469a8e3 to 9fe8355 Compare August 19, 2021 22:12

thaJeztah commented Aug 19, 2021

View reviewed changes

thaJeztah force-pushed the go_ branch 2 times, most recently from 90f8d0c to 61e0ad9 Compare August 19, 2021 22:43

thaJeztah force-pushed the go_ branch from 61e0ad9 to 474be3a Compare August 19, 2021 23:05

thaJeztah force-pushed the go_ branch from 474be3a to b93245a Compare August 20, 2021 07:41

thaJeztah added 3 commits August 20, 2021 13:33

Dockerfile: update to docker/dockerfile:1.3, and remove temporary fix

882fd19

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Dockerfile: remove aufs-tools, as it's not available on bullseye

3ab8dec

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah force-pushed the go_ branch from b93245a to 08b6c87 Compare August 20, 2021 11:40

tianon reviewed Aug 20, 2021

View reviewed changes

thaJeztah added 3 commits August 20, 2021 18:22

Dockerfile: update to debian bullseye

43c6a3d

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Dockerfile: add back libseccomp-dev to cross-compile runc

1effe74

commit 7168d98 removed these, but we overlooked that the same stage is used to build runc as well, so we likely need these. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah force-pushed the go_ branch from 08b6c87 to f68260b Compare August 20, 2021 16:23

tianon approved these changes Aug 21, 2021

View reviewed changes

AkihiroSuda approved these changes Aug 22, 2021

View reviewed changes

AkihiroSuda merged commit 2f74fa5 into moby:master Aug 22, 2021

thaJeztah deleted the go_🎯 branch August 22, 2021 18:37

thaJeztah mentioned this pull request Sep 27, 2021

Dockerfile: switch CRIU install to Debian 11 "bullseye" packages #42888

Merged

prabhav-thali mentioned this pull request Sep 9, 2022

[20.10] Dockerfile: switch to bullseye, add missing libseccomp-dev, remove build pack #44123

Merged

thaJeztah mentioned this pull request Jan 22, 2024

image/save: Fix layers order in OCI manifest #47160

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dockerfile: update syntax, switch to bullseye, add missing libseccomp-dev, remove build pack#42763

Hidden character warning

Dockerfile: update syntax, switch to bullseye, add missing libseccomp-dev, remove build pack#42763
AkihiroSuda merged 6 commits intomoby:masterfrom
thaJeztah:go_🎯

thaJeztah commented Aug 19, 2021 •

edited

Loading

Uh oh!

thaJeztah Aug 19, 2021

Uh oh!

thaJeztah commented Aug 19, 2021

Uh oh!

thaJeztah commented Aug 19, 2021

Uh oh!

thaJeztah commented Aug 20, 2021

Uh oh!

tianon Aug 20, 2021

Uh oh!

thaJeztah Aug 20, 2021

Uh oh!

tianon Aug 20, 2021

Uh oh!

thaJeztah commented Aug 20, 2021

Uh oh!

thaJeztah commented Aug 20, 2021

Uh oh!

tianon Aug 21, 2021

Uh oh!

thaJeztah Aug 21, 2021

Uh oh!

thaJeztah commented Aug 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

thaJeztah commented Aug 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Dockerfile: update to docker/dockerfile:1.3, and remove temporary fix.

Dockerfile: remove aufs-tools, as it's not available on bullseye

Dockerfile: update to debian bullseye

Dockerfile: add back libseccomp-dev to cross-compile runc

Dockerfile: frozen images: update to bullseye, remove buildpack-dep

Uh oh!

thaJeztah Aug 19, 2021

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Aug 19, 2021

Uh oh!

thaJeztah commented Aug 19, 2021

Uh oh!

thaJeztah commented Aug 20, 2021

Uh oh!

tianon Aug 20, 2021

Choose a reason for hiding this comment

Uh oh!

thaJeztah Aug 20, 2021

Choose a reason for hiding this comment

Uh oh!

tianon Aug 20, 2021

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Aug 20, 2021

Uh oh!

thaJeztah commented Aug 20, 2021

Uh oh!

tianon Aug 21, 2021

Choose a reason for hiding this comment

Uh oh!

thaJeztah Aug 21, 2021

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Aug 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

thaJeztah commented Aug 19, 2021 •

edited

Loading