From ec42479304ba24675d78bedab3fb6de97d760a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Wed, 27 Sep 2023 21:26:17 +0200
Subject: [PATCH] update ubuntu to 22.04 and php to 8.1

---
 docker/Dockerfile                 | 10 +++++-----
 docker/configs/nginx.conf         |  2 +-
 docker/scripts/entry-point-dev.sh |  4 ++--
 docker/scripts/entry-point.sh     |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7265eaa..44d5c3f 100644
--- a/docker/Dockerfile
+++ b/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
diff --git a/docker/configs/nginx.conf b/docker/configs/nginx.conf
index 1d253b9..a0bfb54 100644
--- a/docker/configs/nginx.conf
+++ b/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;
         }
 
diff --git a/docker/scripts/entry-point-dev.sh b/docker/scripts/entry-point-dev.sh
index e1254a0..47ee3d9 100755
--- a/docker/scripts/entry-point-dev.sh
+++ b/docker/scripts/entry-point-dev.sh
@@ -23,11 +23,11 @@ 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
+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 &
 
diff --git a/docker/scripts/entry-point.sh b/docker/scripts/entry-point.sh
index 4bd9034..cca2d24 100755
--- a/docker/scripts/entry-point.sh
+++ b/docker/scripts/entry-point.sh
@@ -14,12 +14,12 @@ USER_GID=$(stat -c "%g" .env)
 groupadd --gid $USER_GID mapg
 useradd --uid $USER_UID --gid $USER_GID mapg
 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 &