Build patch-version specific tags and use those in cache-from so rebuilds with the same patch-version use cache and can be skipped

Move nodejs install to end so multiple nodejs versions of the image can reuse all the php layers (and save time building the php extensions)

Author: wslaghekke

.github/workflows/build.yaml

@@ -14,12 +14,12 @@ jobs:
     strategy:
       matrix:
         php:
-        - '^(7\.4)-apache$'
-        - '^(8\.0)-apache$'
-        - '^(8\.1)-apache$'
-        - '^(7\.4)-fpm$'
-        - '^(8\.0)-fpm$'
-        - '^(8\.1)-fpm$'
+        - '^(7\.4)(\.\d+)?-apache$'
+        - '^(8\.0)(\.\d+)?-apache$'
+        - '^(8\.1)(\.\d+)?-apache$'
+        - '^(7\.4)(\.\d+)?-fpm$'
+        - '^(8\.0)(\.\d+)?-fpm$'
+        - '^(8\.1)(\.\d+)?-fpm$'
     steps:
       - name: Setup multi-architecture support
         run: 'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes'

apache/Dockerfile

@@ -23,7 +23,6 @@ RUN pecl install apcu \
     && pecl clear-cache \
     && echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini
 
-
 # Upload settings
 RUN echo "file_uploads = On\n" \
          "memory_limit = 256M\n" \
@@ -45,14 +44,6 @@ RUN curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/composer \
     && mkdir /var/www/html/public
 
-ARG NODE_VERSION
-ARG TARGETARCH
-RUN (curl -SL --fail -o node.tar.xz "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-$TARGETARCH.tar.xz" || curl -SL --fail -o node.tar.xz "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.xz") \
-    && tar -xJf "node.tar.xz" -C /usr/local --strip-components=1 \
-    && rm "node.tar.xz" \
-    && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
-    && npm install --global yarn
-
 ARG ENABLE_IMAGE_SUPPORT=false
 RUN $ENABLE_IMAGE_SUPPORT \
  && apt-get update \
@@ -75,3 +66,11 @@ RUN $ENABLE_DEBUG \
  && sed -i.bak "s/display_errors = 0/display_errors = 1/g" /usr/local/etc/php/conf.d/general.ini \
  && sed -i.bak "s/display_startup_errors = 0/display_startup_errors = 1/g" /usr/local/etc/php/conf.d/general.ini \
  || true
+
+ARG NODE_VERSION
+ARG TARGETARCH
+RUN (curl -SL --fail -o node.tar.xz "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-$TARGETARCH.tar.xz" || curl -SL --fail -o node.tar.xz "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.xz") \
+    && tar -xJf "node.tar.xz" -C /usr/local --strip-components=1 \
+    && rm "node.tar.xz" \
+    && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
+    && npm install --global yarn

src/index.ts

@@ -17,18 +17,20 @@ import {createClientV2} from 'docker-registry-client';
             return {
                 tag: it,
                 version: match && match[1],
+                exactVersion: match && (match[1] + (match[2] || '')),
                 webServer: it.includes('-fpm') ? WebServerType.NGINX : WebServerType.APACHE,
             } as PhpVersion;
         }).filter(it => it.version);
+        const highestPhpVersion = phpVersions.reduce((a, b) => {
+            return compareVersions(a.exactVersion, b.exactVersion) === -1 ? b : a;
+        });
 
         const nodeVersions = await getNodeLtsVersions();
 
         const docker = new Docker();
 
-        for (let phpVersion of phpVersions) {
-            const imageTags = await buildImages(docker, phpVersion, nodeVersions)
-            await createOrUpdateRelease(phpVersion, imageTags)
-        }
+        const imageTags = await buildImages(docker, highestPhpVersion, nodeVersions)
+        await createOrUpdateRelease(highestPhpVersion, imageTags)
     } catch (e) {
         console.error('Build failed: ', e);
         process.exit(typeof e == 'number' ? e : 1);
@@ -95,17 +97,21 @@ async function buildImages(docker: Docker, phpVersion: PhpVersion, nodeVersions:
 
 async function buildAndPushImage(docker: Docker, phpVersion: PhpVersion, nodeVersion: NodeVersion, imageSupport: boolean, debug: boolean) {
     const imageName = 'recognizebv/symfony-docker';
-    const tagName = `php${phpVersion.version}${phpVersion.webServer === WebServerType.NGINX ? '-nginx' : ''}-node${nodeVersion.major}` + (imageSupport ? '-image' : '') + (debug ? '-dev' : '');
+    const tagSuffix = `${phpVersion.webServer === WebServerType.NGINX ? '-nginx' : ''}-node${nodeVersion.major}` + (imageSupport ? '-image' : '') + (debug ? '-dev' : '');
+    const exactTagName = `php${phpVersion.exactVersion}${tagSuffix}`
+    const tagName = `php${phpVersion.version}${tagSuffix}`
     const tag = imageName + ':' + tagName;
     const architecture = process.argv[3] ?? 'linux/amd64';
 
-    console.log('Building image ' + tag);
+    console.log(`Building image ${tag} with base image version ${phpVersion.exactVersion}`);
     const childProcess = spawn('docker', [
         'buildx',
         'build',
         '--platform', architecture,
         '--push',
         '-f', phpVersion.webServer === WebServerType.NGINX ? 'nginx/Dockerfile' : 'apache/Dockerfile',
+        '--cache-from', `${imageName}:${tagName}`,
+        '--tag', `${imageName}:${exactTagName}`,
         '--tag', `${imageName}:${tagName}`,
         '--build-arg', `BASE_IMAGE=php:${phpVersion.tag}`,
         '--build-arg', `NODE_VERSION=${nodeVersion.version}`,

src/model.ts

@@ -11,6 +11,7 @@ export interface NodeVersion {
 
 export interface PhpVersion {
     version: string;
+    exactVersion: string;
     tag: string;
     webServer: string;
 }