Skip to content

dind: remove containerd, ctr and use embedded containerd #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thaJeztah wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

dind: remove containerd, ctr and use embedded containerd #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1596a7c
dind: remove zfs dependency
thaJeztah Sep 8, 2026
00dff1d
remove containerd, ctr and use embedded containerd
thaJeztah Aug 15, 2026
b7dfe60
fixup! remove containerd, ctr and use embedded containerd
thaJeztah Sep 4, 2026
f00b3c6
fixup! remove containerd, ctr and use embedded containerd
thaJeztah Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 29/dind/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Dockerfile-dind.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

Expand Down
Loading