Merge branch 'release/29.x'

* release/29.x: #4215 - Ability to specify GID and UID for the user used inside the Docker image
inception-project · Oct 3, 2023 · 67dac4b · 67dac4b
2 parents b66e0b6 + ba0598e
commit 67dac4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/inception/inception-docker/src/main/docker/Dockerfile b/inception/inception-docker/src/main/docker/Dockerfile
@@ -36,7 +36,7 @@ ENV APP_UID=2000
 ENV APP_GROUP=inception
 ENV APP_GID=2000
 RUN groupadd -g ${APP_GID} ${APP_GROUP} \ 
-    && useradd -m \
+    && useradd \
       -d /opt/inception  \
       -s /bin/bash  \
       -g ${APP_GROUP} -u ${APP_UID} ${APP_USER} \

diff --git a/inception/inception-docker/src/main/docker/launch.sh b/inception/inception-docker/src/main/docker/launch.sh
@@ -32,4 +32,4 @@ echo "Launching application..."
 COMMAND="$(which $1)" 
 shift
 ARGUMENTS="$(printf "\"%s\" " "$@")"
-exec su -l -c "${COMMAND} ${ARGUMENTS}" "$APP_USER"
+exec su -p -c "${COMMAND} ${ARGUMENTS}" "$APP_USER"