From 8c3f23f38cc1172b807ef5e15a82576566eb7f72 Mon Sep 17 00:00:00 2001 From: chenhang Date: Mon, 1 Jun 2026 17:32:17 -0700 Subject: [PATCH 1/2] Fix release script --- dev/release/000-run-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index 88f25f3efd6..ccc67d5c717 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -50,7 +50,7 @@ fi docker buildx build --platform linux/amd64 -t "${IMAGE_NAME}-${USER_NAME}" - < /dev/null; then groupadd --non-unique -g ${GROUP_ID} ${USER_NAME}; fi && \ - if ! getent passwd ${USER_NAME} > /dev/null; then useradd -l -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}; fi && \ + if ! getent passwd ${USER_NAME} > /dev/null; then useradd -l --non-unique -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}; fi && \ ([ "$(dirname "$HOME")" = "/home" ] || ln -s /home $(dirname "$HOME")) && \ mkdir -p /gpg && chown ${USER_ID}:${GROUP_ID} /gpg && chmod 700 /gpg ENV HOME /home/${USER_NAME} From 994990e2b583e41e839d0753993e725139aa4f31 Mon Sep 17 00:00:00 2001 From: chenhang Date: Mon, 1 Jun 2026 18:40:28 -0700 Subject: [PATCH 2/2] Fix release script --- dev/release/000-run-docker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh index ccc67d5c717..303049ca38c 100755 --- a/dev/release/000-run-docker.sh +++ b/dev/release/000-run-docker.sh @@ -49,8 +49,9 @@ fi docker buildx build --platform linux/amd64 -t "${IMAGE_NAME}-${USER_NAME}" - < /dev/null; then groupadd --non-unique -g ${GROUP_ID} ${USER_NAME}; fi && \ - if ! getent passwd ${USER_NAME} > /dev/null; then useradd -l --non-unique -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}; fi && \ +RUN if getent passwd ${USER_ID} > /dev/null && [ "\$(getent passwd ${USER_ID} | cut -d: -f1)" != "${USER_NAME}" ]; then userdel -r -f \$(getent passwd ${USER_ID} | cut -d: -f1) 2>/dev/null || true; fi && \ + if ! getent group ${GROUP_ID} > /dev/null; then groupadd --non-unique -g ${GROUP_ID} ${USER_NAME}; fi && \ + if ! getent passwd ${USER_NAME} > /dev/null; then useradd -l -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}; fi && \ ([ "$(dirname "$HOME")" = "/home" ] || ln -s /home $(dirname "$HOME")) && \ mkdir -p /gpg && chown ${USER_ID}:${GROUP_ID} /gpg && chmod 700 /gpg ENV HOME /home/${USER_NAME}