Skip to content

Add 29.5.0#575

Merged
yosifkit merged 1 commit into
docker-library:masterfrom
infosiftr:drop-vpnkit
May 15, 2026
Merged

Add 29.5.0#575
yosifkit merged 1 commit into
docker-library:masterfrom
infosiftr:drop-vpnkit

Conversation

@yosifkit
Copy link
Copy Markdown
Member

@yosifkit yosifkit commented May 13, 2026

vpnkit is no longer included in the docker-rootless-extras-*.tgz and is no longer necessary for RootlessKit 3.0.0: moby/moby#52319

Since it is no longer included, the automated update job cannot successfully build the 29.5.0 release:

+ wget -O rootless.tgz https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.5.0.tgz
...
+ tar --extract --file rootless.tgz --strip-components 1 --directory /usr/local/bin/ docker-rootless-extras/rootlesskit docker-rootless-extras/vpnkit
tar: docker-rootless-extras/vpnkit: not found in archive

@yosifkit
Copy link
Copy Markdown
Member Author

yosifkit commented May 14, 2026

--net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \

I think this may need adjusting; I'm looking into it. Updated to slirp4netns.

- drop vpnkit for 29.5+
moby/moby#52319
@yosifkit yosifkit changed the title Add 29.5.0-rc.1, drop vpnkit for 29.5+ Add 29.5.0 May 14, 2026
@thaJeztah
Copy link
Copy Markdown
Contributor

@AkihiroSuda could you have a quick peek if the changes for rootless are correct?

Copy link
Copy Markdown
Contributor

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

# [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

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

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

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

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.

Copy link
Copy Markdown
Contributor

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@yosifkit yosifkit merged commit 55b0b1c into docker-library:master May 15, 2026
5 checks passed
@yosifkit yosifkit deleted the drop-vpnkit branch May 15, 2026 21:15
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request May 15, 2026
yosifkit added a commit to docker-library/official-images that referenced this pull request May 15, 2026
Changes:

- docker-library/docker@55b0b1c: Add 29.5.0 (docker-library/docker#575)
- docker-library/docker@132c91a: Update 29 to buildx 0.34.0

Co-authored-by: Docker Library Bot <doi+docker-library-bot@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants