Skip to content

dind: remove containerd, 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

Merged
yosifkit merged 1 commit into from
Oct 1, 2026
Merged

dind: remove containerd, and use embedded containerd #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Dockerfile-dind.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,17 @@ 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' \
{{ if .version == "29.8.2" then "" else ( -}}
# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image)
--exclude 'docker/containerd' \
{{ ) end -}}
; \
rm docker.tgz; \
\
dockerd --version; \
Comment on lines +68 to 74

@tianon tianon Oct 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do something like this, we can merge this as-is now with no changes, and it will only apply the change on the next release (even if it's an RC):

Suggested change
# 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; \
{{ if .version == "29.8.2" then "" else ( -}}
# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image)
--exclude 'docker/containerd' \
{{ ) end -}}
; \
rm docker.tgz; \
\
dockerd --version; \
{{ if .version == "29.8.2" then ( -}}
containerd --version; \
{{ ) else "" end -}}

@thaJeztah thaJeztah Oct 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx! Applied your changes 👍

cc @vvoland FYI

{{ if .version == "29.8.2" then ( -}}
containerd --version; \
{{ ) else "" end -}}
ctr --version; \
runc --version

Expand Down
Loading