yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [yetus] branch master updated: Dockerfile.patchspecific doesn't work when gid isn't defined
Date Wed, 06 Feb 2019 22:44:27 GMT
This is an automated email from the ASF dual-hosted git repository.

aw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git


The following commit(s) were added to refs/heads/master by this push:
     new 654c8b7  Dockerfile.patchspecific doesn't work when gid isn't defined
654c8b7 is described below

commit 654c8b780c67b178f9cdd8988290455a2604b045
Author: Allen Wittenauer <aw@apache.org>
AuthorDate: Sun Feb 3 13:11:45 2019 -0800

    Dockerfile.patchspecific doesn't work when gid isn't defined
    
    Signed-off-by: Allen Wittenauer <aw@apache.org>
---
 precommit/src/main/shell/test-patch-docker/Dockerfile.patchspecific | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile.patchspecific b/precommit/src/main/shell/test-patch-docker/Dockerfile.patchspecific
index 712079a..974acea 100644
--- a/precommit/src/main/shell/test-patch-docker/Dockerfile.patchspecific
+++ b/precommit/src/main/shell/test-patch-docker/Dockerfile.patchspecific
@@ -30,9 +30,7 @@ RUN useradd -g "${GROUP_ID}" -u "${USER_ID}" -m "${USER_NAME}" || true
 
 # docker socket handling.  unless /etc/group is mounted, we have to do this.
 
-RUN if [ "${DOCKER_SOCKET_GID}" != -1 ]; then groupadd --non-unique --gid ${DOCKER_SOCKET_GID}
dockersock || true; fi
-RUN if [ "${DOCKER_SOCKET_GID}" = -1 ]; then groupadd  --non-unique --gid ${DOCKER_SOCKET_GID}
dockersock || true; fi
-RUN adduser "${USER_NAME}" dockersock || true
+RUN if [ "${DOCKER_SOCKET_GID}" != -1 ]; then (groupadd --non-unique --gid ${DOCKER_SOCKET_GID}
dockersock && adduser "${USER_NAME}" dockersock ) || true; fi
 
 RUN mkdir -p /testptch/extras
 RUN chmod a+rwx /testptch/extras


Mime
View raw message