diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index a6a1802fb..7d5d970cb 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -17,7 +17,6 @@ RUN set -eux; \ pigz \ shadow-uidmap \ xz \ - zfs \ ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, @@ -80,11 +79,12 @@ RUN set -eux; \ --no-same-owner \ # we exclude the CLI binary because we already extracted that over in the "docker:29-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ +# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) + --exclude 'docker/containerd' \ ; \ rm docker.tgz; \ \ dockerd --version; \ - containerd --version; \ ctr --version; \ runc --version diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 1767d0bf4..1f97cfa51 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -12,7 +12,6 @@ RUN set -eux; \ pigz \ shadow-uidmap \ xz \ - zfs \ ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, @@ -65,11 +64,12 @@ RUN set -eux; \ --no-same-owner \ # we exclude the CLI binary because we already extracted that over in the "docker:{{ env.version }}-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ +# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) + --exclude 'docker/containerd' \ ; \ rm docker.tgz; \ \ dockerd --version; \ - containerd --version; \ ctr --version; \ runc --version