Update templates to be compatible with latest serversideup/php beta (#77)

Author: jaydrogers

templates/laravel/Dockerfile

@@ -1,15 +1,46 @@
+############################################
+# Base Image
+############################################
+
 # Learn more about the Server Side Up PHP Docker Images at:
 # https://serversideup.net/open-source/docker-php/
-
 FROM serversideup/php:beta-8.3-fpm-nginx as base
 
+## Uncomment if you need to install additional PHP extensions
+# USER root
+# RUN install-php-extensions bcmath gd
+
+############################################
+# Development Image
+############################################
 FROM base as development
 
-# Fix permission issues in development by setting the "www-data"
-# user to the same user and group that is running docker.
+# We can pass USER_ID and GROUP_ID as build arguments
+# to ensure the www-data user has the same UID and GID
+# as the user running Docker.
 ARG USER_ID
 ARG GROUP_ID
-RUN docker-php-serversideup-set-id www-data ${USER_ID} ${GROUP_ID}
 
+# Switch to root so we can set the user ID and group ID
+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
+USER www-data
+
+############################################
+# CI image
+############################################
+FROM base as ci
+
+# Sometimes CI images need to run as root
+# so we set the ROOT user and configure
+# the PHP-FPM pool to run as www-data
+USER root
+RUN echo "user = www-data" >> /usr/local/etc/php-fpm.d/docker-php-serversideup-pool.conf && \
+    echo "group = www-data" >> /usr/local/etc/php-fpm.d/docker-php-serversideup-pool.conf
+
+############################################
+# Production Image
+############################################
 FROM base as deploy
-COPY --chown=www-data:www-data . /var/www/html
+COPY --chown=www-data:www-data . /var/www/html
+USER www-data

templates/laravel/docker-compose.dev.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   traefik:
     networks:
@@ -33,7 +32,7 @@ services:
       - "traefik.http.routers.laravel.rule=HostRegexp(`laravel.dev.test`)"
       - "traefik.http.routers.laravel.entrypoints=websecure"
       - "traefik.http.routers.laravel.tls=true"
-      - "traefik.http.services.laravel.loadbalancer.server.port=80"
+      - "traefik.http.services.laravel.loadbalancer.server.port=8080"
       - "traefik.http.services.laravel.loadbalancer.server.scheme=http"
 
   node:

templates/laravel/docker-compose.prod.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
 
   traefik:
@@ -86,7 +85,7 @@ services:
         - "traefik.http.routers.my-php-app.entrypoints=websecure"
         - "traefik.http.routers.my-php-app.tls=true"
         - "traefik.http.routers.my-php-app.tls.certresolver=letsencryptresolver"
-        - "traefik.http.services.my-php-app.loadbalancer.server.port=80"
+        - "traefik.http.services.my-php-app.loadbalancer.server.port=8080"
         - "traefik.http.services.my-php-app.loadbalancer.server.scheme=http"
         # Health check
         - "traefik.http.services.my-php-app.loadbalancer.healthcheck.path=/ping"

templates/laravel/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
 
   traefik: