Skip to content

dockerd: skip copy nested binaries - #30288

Open
AndyChiang888 wants to merge 1 commit into
openwrt:masterfrom
AndyChiang888:dockerd
Open

dockerd: skip copy nested binaries#30288
AndyChiang888 wants to merge 1 commit into
openwrt:masterfrom
AndyChiang888:dockerd

Conversation

@AndyChiang888

@AndyChiang888 AndyChiang888 commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

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

📦 Package Details

Maintainer: @G-M0N3Y-2503

Description:


🧪 Run Testing Details

  • OpenWrt Version: Snapshot
  • OpenWrt Target/Subtarget: x86/64
  • OpenWrt Device: N100

✅ 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.

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

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/install only pulls dockerd and docker-proxy out of bundles/binary-daemon/, so the nested host binaries this patch stops copying were never packaged. containerd, runc and tini come in as proper DEPENDS, and Build/Prepare already pins them to the vendored versions.
  • PKG_RELEASE 1 → 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

Comment thread utils/dockerd/patches/001-skip-copy-nested-binaries.patch

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

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

Comment thread utils/dockerd/patches/001-skip-copy-nested-binaries.patch Outdated
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>
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.

2 participants