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

Reviewed-on: #84

composer.json

@@ -10,11 +10,10 @@
     }
   ],
   "require": {
-    "esoko/soko-web": "0.14.1",
-    "fzaninotto/faker": "^1.9"
+    "esoko/soko-web": "0.15"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.6",
+    "phpunit/phpunit": "^10.3",
     "phpstan/phpstan": "^1.10"
   },
   "autoload": {

docker/Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:focal AS mapg_base
+FROM ubuntu:22.04 AS mapg_base
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt update --fix-missing && apt install -y sudo curl git unzip mariadb-client nginx \
-    php-apcu php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
+    php-apcu php8.1-cli php8.1-curl php8.1-fpm php8.1-mbstring php8.1-mysql php8.1-zip php8.1-xml
 
 RUN mkdir -p /run/php
 COPY docker/configs/nginx.conf /etc/nginx/sites-available/default
@@ -20,9 +20,9 @@ FROM mapg_base AS mapg_dev
 
 RUN apt update --fix-missing && apt install -y php-xdebug
 
-RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini &&\
-    echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini &&\
-    echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_connect_back = 1" >> /etc/php/8.1/mods-available/xdebug.ini
 
 EXPOSE 80
 EXPOSE 5000

docker/configs/nginx.conf

@@ -18,7 +18,7 @@ server {
 
         location ~ \.php$ {
                 include snippets/fastcgi-php.conf;
-                fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
+                fastcgi_pass unix:/var/run/php/php8.1-fpm.sock;
                 fastcgi_param REQUEST_SCHEME $forwarded_scheme;
         }
 

docker/scripts/entry-point-dev.sh

@@ -19,15 +19,19 @@ echo "Migrating DB..."
 ./mapg db:migrate
 
 echo "Set runner user based on owner of .env..."
-USER_UID=$(stat -c "%u" .env)
-USER_GID=$(stat -c "%g" .env)
-groupadd --gid $USER_GID mapg
-useradd --uid $USER_UID --gid $USER_GID mapg
-sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/7.4/fpm/pool.d/www.conf
+if ! getent group mapg; then
+    USER_GID=$(stat -c "%g" .env)
+    groupadd --gid $USER_GID mapg
+fi
+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
 
-/usr/sbin/php-fpm7.4 -F &
+/usr/sbin/php-fpm8.1 -F &
 /usr/sbin/nginx -g 'daemon off;' &
 sudo -u mapg -g mapg /usr/bin/node --inspect=0.0.0.0:9229 multi &
 

docker/scripts/entry-point.sh

@@ -9,17 +9,21 @@ echo "Installing crontab..."
 /usr/bin/crontab docker/scripts/cron
 
 echo "Set runner user based on owner of .env..."
-USER_UID=$(stat -c "%u" .env)
-USER_GID=$(stat -c "%g" .env)
-groupadd --gid $USER_GID mapg
-useradd --uid $USER_UID --gid $USER_GID mapg
+if ! getent group mapg; then
+    USER_GID=$(stat -c "%g" .env)
+    groupadd --gid $USER_GID mapg
+fi
+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/7.4/fpm/pool.d/www.conf
+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
 
 /usr/sbin/cron -f &
-/usr/sbin/php-fpm7.4 -F &
+/usr/sbin/php-fpm8.1 -F &
 /usr/sbin/nginx -g 'daemon off;' &
 sudo -u mapg -g mapg /usr/bin/node multi &