DRY: single parameterised Dockerfile and matrix CI

.dockerignore

@@ -0,0 +1,5 @@
+.git
+.github
+.idea
+.steiner
+*.md

.github/workflows/docker-build.yaml

@@ -18,6 +18,13 @@ jobs:
     strategy:
       matrix:
         php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
+        include:
+          # Ubuntu base image per PHP version
+          - { php: '8.1', ubuntu: 'jammy' }
+          - { php: '8.2', ubuntu: 'jammy' }
+          - { php: '8.3', ubuntu: 'jammy' }
+          - { php: '8.4', ubuntu: 'noble' }
+          - { php: '8.5', ubuntu: 'noble' }
 
     steps:
       - name: Checkout
@@ -44,7 +51,10 @@ jobs:
       - name: PHP CLI container
         uses: docker/build-push-action@v6
         with:
-          context: php/${{ matrix.php }}
+          context: .
+          build-args: |
+            PHP_VERSION=${{ matrix.php }}
+            UBUNTU=${{ matrix.ubuntu }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: ${{ github.ref == 'refs/heads/master' }}
           pull: true
@@ -54,14 +64,17 @@ jobs:
           tags: phpdockerio/php:${{ matrix.php }}-cli
           target: cli
 
+      # FPM is built on top of the CLI stage, so it reuses its layers from the cache above
       - name: PHP FPM container
         uses: docker/build-push-action@v6
         with:
-          context: php/${{ matrix.php }}
+          context: .
+          build-args: |
+            PHP_VERSION=${{ matrix.php }}
+            UBUNTU=${{ matrix.ubuntu }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: ${{ github.ref == 'refs/heads/master' }}
           pull: true
-          # Enable BuildKit cache restore/save across workflow runs
           cache-from: type=gha,scope=php-${{ matrix.php }}
           cache-to: type=gha,mode=max,scope=php-${{ matrix.php }}
           tags: phpdockerio/php:${{ matrix.php }}-fpm

Dockerfile

@@ -0,0 +1,74 @@
+##########################################
+# PHPDocker.io PHP CLI and FPM image      #
+# Build with --build-arg PHP_VERSION=8.x  #
+##########################################
+
+# Ubuntu release the image is based on, also used to pick the Ondrej PPA suite
+ARG UBUNTU=noble
+
+### CLI ###
+
+FROM ubuntu:${UBUNTU} AS cli
+
+ARG UBUNTU
+ARG PHP_VERSION
+
+# Fixes some weird terminal issues such as broken clear / CTRL+L
+ENV TERM=linux
+
+# Ensure apt doesn't ask questions when installing stuff
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install Ondrej repos for Ubuntu, PHP, composer and selected extensions - better selection than
+# the distro's packages
+#
+# From PHP 8.5 opcache is built into the PHP runtime and there is no separate package for it.
+RUN test -n "${PHP_VERSION}" || { echo "PHP_VERSION build arg is required" >&2; exit 1; } \
+    && OPCACHE="" \
+    && if dpkg --compare-versions "${PHP_VERSION}" lt 8.5; then OPCACHE="php${PHP_VERSION}-opcache"; fi \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends gnupg \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu ${UBUNTU} main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
+    && apt-get update \
+    && apt-get -y --no-install-recommends install \
+        ca-certificates \
+        curl \
+        unzip \
+        php${PHP_VERSION}-apcu \
+        php${PHP_VERSION}-cli \
+        php${PHP_VERSION}-curl \
+        php${PHP_VERSION}-mbstring \
+        ${OPCACHE} \
+        php${PHP_VERSION}-readline \
+        php${PHP_VERSION}-xml \
+        php${PHP_VERSION}-zip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* ~/.composer
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+CMD ["php", "-a"]
+
+### FPM ###
+
+FROM cli AS fpm
+
+ARG PHP_VERSION
+
+# Install FPM. The version-independent symlink lets CMD (exec form, no ARG expansion) avoid the version.
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install php${PHP_VERSION}-fpm \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
+    && ln -s /usr/sbin/php-fpm${PHP_VERSION} /usr/sbin/php-fpm
+
+STOPSIGNAL SIGQUIT
+
+# PHP-FPM packages need a nudge to make them docker-friendly
+COPY overrides.conf /etc/php/${PHP_VERSION}/fpm/pool.d/z-overrides.conf
+
+CMD ["/usr/sbin/php-fpm", "-O" ]
+
+# Open up fcgi port
+EXPOSE 9000