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 6 commits into
base: master
Choose a base branch
from
+10 −18
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b75aaf
dind: remove btrfs-progs dependency
thaJeztah Sep 4, 2026
3806f36
dind: remove e2fsprogs and xfsprogs dependencies
thaJeztah Sep 4, 2026
27c828f
dind: remove duplicate git dependency
thaJeztah Sep 4, 2026
f861447
dind: update links for runtime-dependencies
thaJeztah Sep 4, 2026
5500fe3
remove containerd, ctr and use embedded containerd
thaJeztah Aug 15, 2026
a073bca
fixup! remove containerd, ctr and use embedded containerd
thaJeztah Sep 4, 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
14 changes: 5 additions & 9 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.

14 changes: 5 additions & 9 deletions Dockerfile-dind.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
{{ include "shared" -}}
FROM docker:{{ env.version }}-cli

# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
# Runtime dependencies:
# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies
# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36
RUN set -eux; \
apk add --no-cache \
btrfs-progs \
e2fsprogs \
e2fsprogs-extra \
git \
ip6tables \
iptables \
openssl \
pigz \
shadow-uidmap \
xfsprogs \
xz \
zfs \
;
Expand Down Expand Up @@ -69,12 +65,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 'docker/containerd' \
--exclude 'docker/ctr' \
; \
rm docker.tgz; \
\
dockerd --version; \
containerd --version; \
ctr --version; \
runc --version

# https://github.com/docker/docker/tree/master/hack/dind
Expand Down
Loading