Update Docker to 29.1.1 #27995

uparrows · 2025-12-01T19:25:02Z

📦 Package Details

Maintainer: @gerard Ryan
_{(You can find this by checking the history of the package Makefile.)}

Description:

Update all docker packages to 29.1.1

🧪 Run Testing Details

**OpenWrt Version:OpenWrt 24.10.4 r28959-29397011cc / LuCI openwrt-24.10 branch 25.292.66247~75e41cb
**OpenWrt Target/Subtarget:x86/64
**OpenWrt Device:CncTion J4125-4L

✅ Formalities

I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

If your PR contains a patch:

It can be applied using git am
It has been refreshed to avoid offsets, fuzzes, etc., using
```
make package/<your-package>/refresh V=s
```
It is structured in a way that it is potentially upstreamable
_{(e.g., subject line, commit description, etc.)}
_{We must try to upstream patches to reduce maintenance burden.}

uparrows · 2025-12-02T10:18:17Z

before compile , edit /home/user/openwrt/feeds/packages/utils/dockerd/files/etc/config/dockerd option iptables '0' ,docker will use nftables instead of iptables.

hnyman · 2025-12-06T04:33:31Z

Cc @G-M0N3Y-2503

G-M0N3Y-2503 · 2025-12-06T05:20:37Z

Just a couple of things, and the CI is complaining too. But thanks for the work!

G-M0N3Y-2503 · 2025-12-06T05:12:02Z

utils/containerd/Makefile

 PKG_NAME:=containerd
-PKG_VERSION:=1.7.22
+PKG_VERSION:=2.2.0
 PKG_RELEASE:=2


Oops, we missed resetting this to 1

G-M0N3Y-2503 · 2025-12-06T05:12:49Z

utils/dockerd/Makefile

 PKG_NAME:=dockerd
-PKG_VERSION:=27.3.1
+PKG_VERSION:=29.1.1
 PKG_RELEASE:=4


We should reset this to 1 also

G-M0N3Y-2503 · 2025-12-06T05:14:03Z

utils/dockerd/Makefile

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_GIT_URL:=github.com/moby/moby
-PKG_GIT_REF:=v$(PKG_VERSION)
+PKG_GIT_REF:=docker-v$(PKG_VERSION)


Why did we add "docker-" here?

because the version number 29.x has an extra "docker-" at the beginning.

oh, I missed that detail, thanks!

Should be in the commit description.

Should be in the commit description.
I have added it to the commit description.

G-M0N3Y-2503 · 2025-12-06T05:16:54Z

utils/containerd/Makefile


 define Package/containerd/install
 	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/{ctr,containerd,containerd-stress,containerd-shim,containerd-shim-runc-v1,containerd-shim-runc-v2} $(1)/usr/bin/


Are these not available anymore or something?

Docker 29 has removed old containerd shim processes (containerd-shim and containerd-shim-runc-v1).

Docker version 29 is an upcoming major update that will use containerd-shim-runc-v2 by default and deprecate the older containerd-shim-runc-v1. Therefore, removing containerd-shim-runc-v1 is not a "manual" operation, but rather the default state after the Docker upgrade. It is an inevitable result of the transition of container runtime from the old standard to the new standard (from runc v1 to runc v2). The main purpose is to improve performance, security, and support for the OCI standard. You do not need to actively "remove" it; simply upgrading Docker will achieve the switch.

thanks again for the info!

Well, please add this to your commit.

commit
I have added it to the commit.

G-M0N3Y-2503 · 2025-12-06T05:17:45Z

utils/runc/Makefile

 PKG_NAME:=runc
-PKG_VERSION:=1.1.14
+PKG_VERSION:=1.3.3
 PKG_RELEASE:=2


We should probably reset this to 1 too.

Yang-Wei-Ting · 2025-12-08T11:53:52Z

utils/dockerd/Makefile

-PKG_GIT_SHORT_COMMIT:=41ca978 # SHA1 used within the docker executables
+PKG_HASH:=65221f1c70feb1bd1562bb1017b586e4528be877656dc16f5be5659fc9b7e522
+PKG_GIT_SHORT_COMMIT:=9a84135 # SHA1 used within the docker executables
+


Hi, please remove this extra newline

hnyman · 2025-12-08T15:32:01Z

You need to squash the extra commits. One per package should be enough.

And please make sure that each commit start with the "packagename: " prefix (like "docker: ".
Now they do not.

update to v2.2.0, remove containerd-shim and containerd-shim-runc-v1, docker 29.x has removed old containerd shim processes (containerd-shim and containerd-shim-runc-v1).

update docker cli to v29.1.1.

docker version 29.x has an extra "docker-" prefix. add "docker-" prefix to "PKG_GIT_REF".

docker v29.1.1 requires runc v1.3.3.

uparrows · 2025-12-08T16:21:30Z

You need to squash the extra commits. One per package should be enough.

And please make sure that each commit start with the "packagename: " prefix (like "docker: ". Now they do not.

okay ,revised as requested

hnyman · 2025-12-09T07:26:13Z

It still fails the new strict CI formality test, as you have no space after the prefix in some of commits.
(and as it fails formality test, no compilation test is even performed)

G-M0N3Y-2503 reviewed Dec 6, 2025

View reviewed changes

BKPepe added not following guidelines needs work labels Dec 6, 2025

uparrows force-pushed the master branch from 31b53e3 to f1d53e6 Compare December 7, 2025 10:29

G-M0N3Y-2503 approved these changes Dec 8, 2025

View reviewed changes

Yang-Wei-Ting reviewed Dec 8, 2025

View reviewed changes

uparrows added 4 commits December 9, 2025 00:10

containerd：update to v2.2.0

b3f8a03

update to v2.2.0, remove containerd-shim and containerd-shim-runc-v1, docker 29.x has removed old containerd shim processes (containerd-shim and containerd-shim-runc-v1).

docker:update to v29.1.1

61c1e86

update docker cli to v29.1.1.

dockerd:update to v29.1.1

57f2d63

docker version 29.x has an extra "docker-" prefix. add "docker-" prefix to "PKG_GIT_REF".

runc:update to v1.3.3

09aa2cd

docker v29.1.1 requires runc v1.3.3.

uparrows force-pushed the master branch from 82b6fc7 to 09aa2cd Compare December 8, 2025 16:13

Update Docker to 29.1.1 #27995

Are you sure you want to change the base?

Update Docker to 29.1.1 #27995

Conversation

uparrows commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Package Details

Update all docker packages to 29.1.1

🧪 Run Testing Details

✅ Formalities

If your PR contains a patch:

Uh oh!

uparrows commented Dec 2, 2025

Uh oh!

hnyman commented Dec 6, 2025

Uh oh!

G-M0N3Y-2503 commented Dec 6, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Yang-Wei-Ting Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hnyman commented Dec 8, 2025

Uh oh!

uparrows commented Dec 8, 2025

Uh oh!

hnyman commented Dec 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

uparrows commented Dec 1, 2025 •

edited

Loading

Yang-Wei-Ting Dec 8, 2025 •

edited

Loading