Skip to content

fix(docker): Improve user name detection when tagging clp-package dev image (fixes #1371). #1373

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
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(docker): Improve user name detection when tagging clp-package dev image (fixes #1371). #1373

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a42385
fix(docker): Improve user name detection when tagging clp-package dev…
junhaoliao Oct 3, 2025
1fa8e98
use whoami first
junhaoliao Oct 3, 2025
68665bd
Use long‑form id options for user detection.
junhaoliao Oct 3, 2025
1532fc6
Merge branch 'main' into user-fallback
junhaoliao Oct 20, 2025
2351301
Merge branch 'main' into user-fallback
junhaoliao Oct 20, 2025
35a08b7
Merge branch 'main' into user-fallback
junhaoliao Oct 21, 2025
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
5 changes: 4 additions & 1 deletion tools/docker-images/clp-package/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ if [[ -s "$temp_iid_file" ]]; then
new_image_id="$(<"$temp_iid_file")"
echo "$new_image_id" > "$iid_file"

user="${USER:-$(id -un 2>/dev/null || whoami 2>/dev/null || echo unknown)}"
user="${USER:-$(whoami 2>/dev/null)}" \
|| user=$(id --user --name 2>/dev/null) \
|| user=$(id --user 2>/dev/null) \
|| user="unknown";
Comment on lines +51 to +54
Copy link
Contributor

@coderabbitai coderabbitai bot Oct 3, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Restore POSIX-friendly id fallbacks.

id --user --name/id --user are GNU-only; macOS and BusyBox reject them, so the script now falls all the way to "unknown" on those platforms. The previous id -un/id -u path worked there, so this is a regression. Please retain the short-option fallbacks (or probe for GNU support) before giving up on resolving the username.

-    user="${USER:-$(whoami 2>/dev/null)}" \
-        || user=$(id --user --name 2>/dev/null) \
-        || user=$(id --user 2>/dev/null) \
+    user="${USER:-$(whoami 2>/dev/null)}" \
+        || user=$(id --user --name 2>/dev/null) \
+        || user=$(id -un 2>/dev/null) \
+        || user=$(id --user 2>/dev/null) \
+        || user=$(id -u 2>/dev/null) \
         || user="unknown";
🤖 Prompt for AI Agents 
In tools/docker-images/clp-package/build.sh around lines 51-54, the current
fallbacks use GNU-only long id options and break on macOS/BusyBox; restore
POSIX-friendly fallbacks by trying id -un and id -u first (then the GNU
long-option forms if desired), then whoami as a next fallback, and finally
"unknown"; implement these attempts with || chains so the script resolves the
username on non-GNU systems before giving up.

short_id="${new_image_id#sha256:}"
short_id="${short_id:0:4}"
docker tag "$new_image_id" "clp-package:dev-${user}-${short_id}"
Expand Down
Loading