You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2018/09/11 15:25:57 UTC

[bookkeeper] branch branch-4.8 updated: Use useradd -l option for docker scripts

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

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


The following commit(s) were added to refs/heads/branch-4.8 by this push:
     new d3ca14f  Use useradd -l option for docker scripts
d3ca14f is described below

commit d3ca14f272aa11f620e0d64348a14fbf45bdc82d
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Tue Sep 11 17:25:23 2018 +0200

    Use useradd -l option for docker scripts
    
    This is a workaround for the Docker issue https://github.com/moby/moby/issues/5419
    
    If you run the scripts with an very large uid the script hangs and it fills up the disk which contains /var/lib/docker
    
    Author: Enrico Olivelli <eo...@apache.org>
    
    Reviewers: Sijie Guo <si...@apache.org>
    
    This closes #1673 from eolivelli/fix/docker-large-uid
    
    (cherry picked from commit c420b39a3dab4e9f8896c59d92cbfe4e9a7a0d30)
    Signed-off-by: Enrico Olivelli <eo...@apache.org>
---
 dev/release/000-run-docker.sh | 2 +-
 site/docker/run.sh            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/release/000-run-docker.sh b/dev/release/000-run-docker.sh
index 255a6a2..edc5a94 100755
--- a/dev/release/000-run-docker.sh
+++ b/dev/release/000-run-docker.sh
@@ -52,7 +52,7 @@ fi
 docker build -t "${IMAGE_NAME}-${USER_NAME}" - <<UserSpecificDocker
 FROM ${IMAGE_NAME}
 RUN groupadd --non-unique -g ${GROUP_ID} ${USER_NAME} && \
-  useradd -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}
+  useradd -l -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}
 ENV  HOME /home/${USER_NAME}
 UserSpecificDocker
 
diff --git a/site/docker/run.sh b/site/docker/run.sh
index a4228ac..f4b2bb9 100755
--- a/site/docker/run.sh
+++ b/site/docker/run.sh
@@ -42,7 +42,7 @@ fi
 docker build -t "${IMAGE_NAME}-${USER_NAME}" - <<UserSpecificDocker
 FROM ${IMAGE_NAME}
 RUN groupadd --non-unique -g ${GROUP_ID} ${USER_NAME} && \
-  useradd -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}
+  useradd -l -g ${GROUP_ID} -u ${USER_ID} -k /root -m ${USER_NAME}
 ENV  HOME /home/${USER_NAME}
 UserSpecificDocker