docker/scripts/entry-point-dev.sh

@@ -19,14 +19,10 @@ echo "Migrating DB..."
 ./mapg db:migrate
 
 echo "Set runner user based on owner of .env..."
-if ! getent group mapg; then
+USER_UID=$(stat -c "%u" .env)
-    USER_GID=$(stat -c "%g" .env)
+USER_GID=$(stat -c "%g" .env)
-    groupadd --gid $USER_GID mapg
+groupadd --gid $USER_GID mapg
-fi
+useradd --uid $USER_UID --gid $USER_GID mapg
-if ! id -u mapg; then
-    USER_UID=$(stat -c "%u" .env)
-    useradd --uid $USER_UID --gid $USER_GID mapg
-fi
 sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf
 
 set +e

docker/scripts/entry-point.sh

@@ -9,14 +9,10 @@ echo "Installing crontab..."
 /usr/bin/crontab docker/scripts/cron
 
 echo "Set runner user based on owner of .env..."
-if ! getent group mapg; then
+USER_UID=$(stat -c "%u" .env)
-    USER_GID=$(stat -c "%g" .env)
+USER_GID=$(stat -c "%g" .env)
-    groupadd --gid $USER_GID mapg
+groupadd --gid $USER_GID mapg
-fi
+useradd --uid $USER_UID --gid $USER_GID mapg
-if ! id -u mapg; then
-    USER_UID=$(stat -c "%u" .env)
-    useradd --uid $USER_UID --gid $USER_GID mapg
-fi
 chown mapg:mapg cache
 sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf