Merge pull request 'update nodejs to 22' (!85) from update-nodejs into develop

Reviewed-on: #85

docker/scripts/entry-point-dev.sh

@@ -19,10 +19,14 @@ 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
+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

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)
-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/8.1/fpm/pool.d/www.conf
 

docker/scripts/install-nodejs.sh

@@ -7,7 +7,7 @@ apt install -y ca-certificates curl gnupg
 mkdir -p /etc/apt/keyrings
 curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 
-NODE_MAJOR=18
+NODE_MAJOR=22
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
 apt update