Update Docker build and publish workflow and

Dockerfiles

.github/workflows/service_docker-build-and-publish.yml

@@ -10,6 +10,9 @@ on:
       dockerfile:
         type: string
         default: './Dockerfile'
+      target:
+        type: string
+        default: 'deploy'
 
 jobs:
   php-build-and-test:
@@ -41,10 +44,11 @@ jobs:
           fail-on-cache-miss: true
 
       - name: docker-build-action
-        uses: serversideup/github-action-docker-build@v2
+        uses: serversideup/github-action-docker-build@v3
         with:
           tags: "${{ inputs.docker-tags }}"
           dockerfile: "${{ inputs.dockerfile }}"
           registry-username: ${{ secrets.DOCKER_HUB_USERNAME }}
           registry-token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-          platforms: "${{ inputs.platforms }}"
+          platforms: "${{ inputs.platforms }}"
+          target: "${{ inputs.target }}"

Dockerfile.node

@@ -1,4 +1,7 @@
-FROM node:20
+FROM node:20 as base
+
+### Development
+FROM base as development
 ARG USER_ID
 
 RUN usermod -u $USER_ID node

Dockerfile.php

@@ -1,11 +1,12 @@
 FROM serversideup/php:beta-8.2.12-unit-bookworm as base
-LABEL maintainer="Server Side Up <@serversideup>"
 
+### Development
 FROM base as development
 ARG USER_ID
 
 RUN usermod -u $USER_ID www-data
 
-# Copy the application with the correct permissions
+### Deploy
 FROM base as deploy
+LABEL maintainer="Server Side Up <@serversideup>"
 COPY --chown=9999:9999 . /var/www/html

docker-compose.ci.yml

@@ -23,6 +23,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.node
+      target: base
     networks:
       - ci
     volumes: