dockerd: skip copy nested binaries - #30288
Conversation
openwrt-ai
left a comment
There was a problem hiding this comment.
Reviewed 1 new commit. Nothing here blocks a merge — one optional robustness suggestion inline.
Checks I ran, for the record:
- The change is safe for the produced package:
Package/dockerd/installonly pullsdockerdanddocker-proxyout ofbundles/binary-daemon/, so the nested host binaries this patch stops copying were never packaged.containerd,runcandtinicome in as properDEPENDS, andBuild/Preparealready pins them to the vendored versions. PKG_RELEASE1 → 2 is correct for adding a patch without a version change.- Patch applies cleanly and all ten target builds are green, so the hunk context matches
docker-v29.6.1; hunk header (@@ -2,21 +2,7 @@) and diffstat (1 insertion, 15 deletions) are self-consistent. - The commit message matches what the diff does, and the
dockerd:subject scope matches the files touched. - No upstream reference requested: this disables a build-host convenience feature rather than fixing a general bug, so it is an OpenWrt-specific patch with nowhere to be sent.
Generated by Claude Code
openwrt-ai
left a comment
There was a problem hiding this comment.
Re-reviewed at 22049e3. The force-push since 9a7a324 changed the commit message only — git diff 9a7a324..22049e3 is empty, both commits share parent 388c3b6, and the sole textual change is `dir` → `$dir` in the message body. So my earlier findings still stand and nothing new is introduced; one leftover nit inline.
On the resolved thread about the bare return: your reasoning is right for the current script. source "${MAKEDIR}/.binary" runs under set -e immediately before copy_binaries "$DEST", so $? is 0 by the time the function is entered and return is equivalent to return 0. Happy to leave it as is.
Still green from the prior pass: the change cannot affect the produced package — Package/dockerd/install only takes dockerd and docker-proxy out of bundles/binary-daemon/; PKG_RELEASE 1 → 2 is the correct bump for adding a patch without a version change; and no upstream reference is warranted for what is an OpenWrt-specific build-host workaround. CI on this head has not reported yet (status pending, 0 checks), so there is nothing to read into that either way.
Generated by Claude Code
This script copies containerd, containerd-shim-runc-v2, ctr, runc, docker-init, rootlesskit, dockerd-rootless.sh, and dockerd-rootless-setuptool.sh into the `$dir` directory, which is unnecessary for OpenWrt. Moreover, if the host is missing any one of these files, cp will fail and cause an error. Fixes: ``` Copying nested executables into bundles/binary-daemon cp: cannot stat '': No such file or directory make[3]: *** [Makefile:166: /home/runner/work/Build/Build/openwrt/build_dir/target-x86_64_musl/dockerd-29.6.1/.built] Error 1 ``` Signed-off-by: Andy Chiang <AndyChiang_git@outlook.com>
This script copies containerd, containerd-shim-runc-v2, ctr, runc, docker-init, rootlesskit, dockerd-rootless.sh, and dockerd-rootless-setuptool.sh into the
$dirdirectory, which is unnecessary for OpenWrt. Moreover, if the host is missing any one of these files, cp will fail and cause an error.Fixes:
📦 Package Details
Maintainer: @G-M0N3Y-2503
Description:
🧪 Run Testing Details
✅ Formalities
If your PR contains a patch:
git am(e.g., subject line, commit description, etc.)
We must try to upstream patches to reduce maintenance burden.