Skip to content

dind: remove obsolete runtime dependencies #584

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
tianon merged 4 commits into from
Sep 4, 2026
+6 −14
Merged

dind: remove obsolete runtime dependencies #584

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
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
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
10 changes: 3 additions & 7 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.

10 changes: 3 additions & 7 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 \

@vvoland vvoland Sep 4, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Doesn't Buildkit also depend on git for the git sources?

@thaJeztah thaJeztah Sep 4, 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.

It does, but the DIND image is based on the CLI image, which has it already installed

@vvoland vvoland Sep 4, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Oh, I should have read the commit body!

ip6tables \
iptables \
openssl \
pigz \
shadow-uidmap \
xfsprogs \
xz \
zfs \

@tianon tianon Sep 4, 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.

Is ZFS really still actually supported?

@tianon tianon Sep 4, 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.

Ah, I see you mention that over in #585, but IMO it has a similar shape/flavor to this PR to remove ZFS here.

@thaJeztah thaJeztah Sep 4, 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.

Yeah, I was considering removing it; for this PR I limited to dependencies that were not needed, so no behavior change. But honestly not sure if anyone would be using ZFS with this image.

@thaJeztah thaJeztah Sep 4, 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.

Let me know if you prefer removing it already, or in a follow up.

@tianon tianon Sep 4, 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.

Yeah, I guess a follow-up would be good so we can let it simmer for a minute and see if anyone sees it and complains (although that will usually only happen after it's merged and released, but at least then there'll be a dedicated place to discuss / explain).

;
Expand Down
Loading