Add GID to docker user creation

gazebo-tooling · Aug 12, 2021 · ef59662 · ef59662
1 parent 079a093
commit ef59662
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash
@@ -415,7 +415,9 @@ cat >> Dockerfile << DELIM_DOCKER_USER
 # Create a user with passwordless sudo
 ARG USERID
 ARG USER
-RUN adduser --uid \$USERID --gecos "Developer" --disabled-password \$USER
+ARG GID
+RUN groupadd -g "\$GID" "\$USER";
+RUN adduser --uid \$USERID --gid \$GID --gecos "Developer" --disabled-password \$USER
 RUN adduser \$USER sudo
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 

diff --git a/jenkins-scripts/docker/lib/docker_run.bash b/jenkins-scripts/docker/lib/docker_run.bash
@@ -24,6 +24,7 @@ USERID=$(id -u)
 USER=$(whoami)
 
 sudo docker build ${_DOCKER_BUILD_EXTRA_ARGS} \
+                  --build-arg GID=$(id -g $USER) \
                   --build-arg USERID=$USERID \
                   --build-arg USER=$USER \
                   --tag ${DOCKER_TAG} .