Merge pull request 'do not recreate docker runner group and user' (!75) from do-no-recreate-group-and-user into master

Reviewed-on: #75

Jenkinsfile

@@ -98,6 +98,17 @@ pipeline {
                                         --push \
                                         .""",
                            label: 'Build Docker image'
+
+                        if (env.BRANCH_NAME == 'master') {
+                            if (env.VERSION ==~ '.*-\\d+-g[a-f0-9]{7}') {
+                                env.FIXED_VERSION = 'dev'
+                            } else {
+                                env.FIXED_VERSION = 'stable'
+                            }
+                            sh script: """docker buildx imagetools create \
+                                            -t git.esoko.eu/esoko/rvr:${env.FIXED_VERSION} \
+                                            git.esoko.eu/esoko/rvr:${env.VERSION}"""
+                        }
                     }
                 }
             }

docker/configs/nginx.conf

@@ -1,3 +1,9 @@
+map $http_x_forwarded_proto $forwarded_scheme {
+        default $scheme;
+        http http;
+        https https;
+}
+
 server {
         listen 80 default_server;
         listen [::]:80 default_server;

docker/scripts/entry-point-dev.sh

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

docker/scripts/entry-point.sh

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

web.php

@@ -19,9 +19,8 @@ use RVR\Repository\UserRepository;
 
 require 'app.php';
 
+error_reporting(E_ALL);
 if (!empty($_ENV['DEV'])) {
-    error_reporting(E_ALL);
-
     ini_set('display_errors', '1');
 } else {
     ini_set('display_errors', '0');