Skip to content

Add 29.5.0 #575

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

Open
yosifkit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add 29.5.0 #575

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions 29/cli/Dockerfile
View file
Open in desktop

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

11 changes: 5 additions & 6 deletions 29/dind-rootless/Dockerfile
View file
Open in desktop

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

8 changes: 4 additions & 4 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.

2 changes: 1 addition & 1 deletion 29/dind/dockerd-entrypoint.sh
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 29/windows/windowsservercore-ltsc2022/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 29/windows/windowsservercore-ltsc2025/Dockerfile
View file
Open in desktop

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

7 changes: 3 additions & 4 deletions Dockerfile-dind-rootless.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FROM docker:{{ env.version }}-dind

# busybox "ip" is insufficient:
# [rootlesskit:child ] error: executing [[ip tuntap add name tap0 mode tap] [ip link set tap0 address 02:50:00:00:00:01]]: exit status 1
# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns"
# slirp4netns is recommended as rootlesskit's net driver
# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended
Copy link
Copy Markdown
Contributor

@AkihiroSuda AkihiroSuda May 15, 2026

Choose a reason for hiding this comment

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

(slirp4netns is no longer necessarily required, as gvisor-tap-vsock is now embedded in rootlesskit)

Copy link
Copy Markdown
Contributor

@thaJeztah thaJeztah May 15, 2026

Choose a reason for hiding this comment

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

In that case, should we simplify, and remove these bits ?

Copy link
Copy Markdown

@vvoland vvoland May 15, 2026

Choose a reason for hiding this comment

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

Yeah I think we should get rid of the slirp4netns is recommended as rootlesskit's net driver, as its no longer recommended over the default?

Copy link
Copy Markdown
Contributor

@AkihiroSuda AkihiroSuda May 15, 2026

Choose a reason for hiding this comment

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

Yes, I suggest removing slirp4netns.

RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns

# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR
Expand Down Expand Up @@ -31,12 +32,10 @@ RUN set -eux; \
--strip-components 1 \
--directory /usr/local/bin/ \
'docker-rootless-extras/rootlesskit' \
'docker-rootless-extras/vpnkit' \
; \
rm rootless.tgz; \
\
rootlesskit --version; \
vpnkit --version
rootlesskit --version

# pre-create "/var/lib/docker" for our rootless user
RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ if [ "$1" = 'dockerd' ]; then
fi
# TODO overlay support detection?
exec rootlesskit \
--net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \
--net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \
--mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \
--disable-host-loopback \
--port-driver=builtin \
Expand Down
16 changes: 8 additions & 8 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"29": {
"arches": {
"amd64": {
"dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.0.tgz"
},
"arm32v6": {
"dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz"
},
"arm32v7": {
"dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz"
},
"arm64v8": {
"dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.0.tgz"
},
"windows-amd64": {
"dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.zip"
"dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.zip"
}
},
"buildx": {
Expand Down Expand Up @@ -167,7 +167,7 @@
"windows/windowsservercore-ltsc2025",
"windows/windowsservercore-ltsc2022"
],
"version": "29.4.3"
"version": "29.5.0"
},
"29-rc": null
}
Loading