This is an automated email from the ASF dual-hosted git repository.

merlimat pushed a commit to branch branch-4.18
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.18 by this push:
     new 6cf36ab27f Fix release script (#4811)
6cf36ab27f is described below

commit 6cf36ab27fbf47617d5e4781168e5f6d5d01df29
Author: Hang Chen <[email protected]>
AuthorDate: Sat Oct 17 09:02:20 2026 -0700

    Fix release script (#4811)
---
 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 ccc67d5c71..303049ca38 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}" - 
<<UserSpecificDocker
 FROM ${IMAGE_NAME}
-RUN 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 --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}

Reply via email to