From dbbdb5b770a3f98ab4ce588d5b02a714b5d78976 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:42:55 +0100
Subject: [PATCH] upgrade to php 8.4 and set user and groupe ID

---
 docker/prod/Dockerfile | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 0459383f9..b2ecd0afa 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -1,6 +1,6 @@
 # Versions
 # https://hub.docker.com/r/serversideup/php/tags?name=8.3-fpm-nginx-alpine
-ARG SERVERSIDEUP_PHP_VERSION=8.3-fpm-nginx-alpine
+ARG SERVERSIDEUP_PHP_VERSION=8.4-fpm-nginx-alpine
 # https://github.com/minio/mc/releases
 ARG MINIO_VERSION=RELEASE.2024-11-05T11-29-45Z
 # https://github.com/cloudflare/cloudflared/releases
@@ -8,15 +8,26 @@ ARG CLOUDFLARED_VERSION=2024.11.0
 # https://www.postgresql.org/support/versioning/ - Can not updated automatically so keep it at 15
 ARG POSTGRES_VERSION=15
 
+# Add user/group build arguments
+ARG USER_ID=9999
+ARG GROUP_ID=9999
+
 # =================================================================
 # Stage 1: Composer dependencies
 # =================================================================
 FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION} AS base
 
+# Set the user ID and group ID for www-data
+USER root
+RUN docker-php-serversideup-set-id www-data $USER_ID:$GROUP_ID && \
+    docker-php-serversideup-set-file-permissions --owner $USER_ID:$GROUP_ID --service nginx
+
 WORKDIR /var/www/html
 COPY --chown=www-data:www-data composer.json composer.lock ./
 RUN composer install --no-dev --no-interaction --no-plugins --no-scripts --prefer-dist
 
+USER www-data
+
 # =================================================================
 # Stage 2: Frontend assets compilation
 # =================================================================
@@ -38,6 +49,8 @@ FROM minio/mc:${MINIO_VERSION} AS minio-client
 # =================================================================
 FROM serversideup/php:${SERVERSIDEUP_PHP_VERSION}
 
+ARG USER_ID
+ARG GROUP_ID
 ARG TARGETPLATFORM
 ARG POSTGRES_VERSION
 ARG CLOUDFLARED_VERSION
@@ -47,6 +60,10 @@ WORKDIR /var/www/html
 
 USER root
 
+# Set the user ID and group ID for www-data
+RUN docker-php-serversideup-set-id www-data $USER_ID:$GROUP_ID && \
+    docker-php-serversideup-set-file-permissions --owner $USER_ID:$GROUP_ID --service nginx
+
 # Install PostgreSQL repository and keys
 RUN apk add --no-cache gnupg && \
     mkdir -p /usr/share/keyrings && \