Gitlab ci Test and build for multiarch

Author: mistraloz

.github/workflows/workflow.yml

@@ -11,49 +11,84 @@ on:
     - cron: '42 3 * * 0'
 
 jobs:
-  build_test_maybe_release:
+  build:
     strategy:
+      fail-fast: false
       matrix:
         php_version: ['8.1','8.0','7.4', '7.3','7.2']
         variant: ['apache','cli','fpm']
-    runs-on: ubuntu-latest
+        builder: [ {arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "macos-latest"}]
+    #        builder: [ {arch: "amd64", os: "self-hosted"}, {arch: "arm64", os: "self-hosted"}]
+    runs-on: ${{ matrix.builder.os }}
+#    runs-on: self-hosted
+    name: Build & test ${{ matrix.php_version }}-${{ matrix.variant }} (${{ matrix.builder.arch }})
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Set up Docker
+        # /!\ this action is marked as experimental
+        # It's required only for macos
+        if: ${{ matrix.builder.os == 'macos-latest' }}
+        uses: docker-practice/actions-setup-docker@master
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Build locally (amd64)
+      - name: Expose GitHub Runtime for docker cache
+        uses: crazy-max/ghaction-github-runtime@v2
+      - name: Build
         run: |
           PHP_VERSION="${{ matrix.php_version }}"
-          docker buildx bake --load \
-            --set "*.platform=linux/amd64" \
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
+          docker buildx bake \
+            --set "*.platform=linux/${{ matrix.builder.arch }}" \
+            --set "*.output=type=docker" \
             php${PHP_VERSION//.}-${{ matrix.variant }}-all
-          # Fetch minor version
-          PHP_VERSION_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-${{ matrix.variant }} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
-          echo "PHP_VERSION_MINOR=${PHP_VERSION_MINOR}" >> $GITHUB_ENV
-          # Summary
-          echo "PHP Version : ${PHP_VERSION_MINOR}" >> $GITHUB_STEP_SUMMARY
-          docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY   
-          docker images --filter=reference=thecodingmachine/php
-      - name: Test variant '${{ matrix.variant }}' (amd64)
-        run:  |
-          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} ./tests-suite/bash_unit -f tap ./tests-suite/*.sh
+      - name: Test
+        run: |
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
+          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} PLATFORM=linux/${{ matrix.builder.arch }} ./tests-suite/bash_unit -f tap ./tests-suite/*.sh
+
+  publish:
+    # push ~ schedule
+    if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    name: Publish multi-arch to dockerhub
+    strategy:
+      fail-fast: false
+      matrix:
+        php_version: ['8.1'] #,'8.0','7.4', '7.3','7.2']
+        variant: ['apache'] #,'cli','fpm']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Expose GitHub Runtime for docker cache
+        uses: crazy-max/ghaction-github-runtime@v2
       - name: Login to DockerHub
-        # Merge ~ push.
-        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push to repository (both amd64 and arm64)
-        # Merge ~ push.
-        if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
+      - name: Build and push ${{ matrix.php_version }}-${{ matrix.variant }} as multiarch (amd64 and arm64)
         run: |
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
+          docker buildx bake \
+            --set "*.cache-from=type=gha" \
+            --set "*.platform=linux/amd64,linux/arm64" \
+            --set "*.output=type=registry" \
+            php${PHP_VERSION//.}-slim-${{ matrix.variant }}
+          PHP_PATCH_MINOR=`docker run --rm thecodingmachine/php:rc-${{ env.GITHUB_SHA_SHORT }}-${{ matrix.php_version }}-v4-slim-${{ matrix.variant }} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
           PHP_VERSION="${{ matrix.php_version }}"
+          TAG_PREFIX="rc-${{ env.GITHUB_SHA_SHORT }}-" \
           PHP_PATCH_MINOR="${{ env.PHP_VERSION_MINOR }}" \
           docker buildx bake \
+            --set "*.cache-from=gha" \
             --set "*.platform=linux/amd64,linux/arm64" \
             --set "*.output=type=registry" \
             php${PHP_VERSION//.}-${{ matrix.variant }}-all

Dockerfile.apache

@@ -1,12 +1,16 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
 
-ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache"
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache"
 FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH

Dockerfile.apache.node14 renamed to Dockerfile.apache.node

@@ -1,26 +1,31 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
 FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH
 ARG BLACKFIRE_VERSION=1
+ARG NODE_VERSION=16
 
 USER root
 
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg && \
-    curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
     apt-get update && \
     apt-get install -y --no-install-recommends nodejs && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
     apt-get install -y --no-install-recommends yarn && \
-    npm install -g npm && \
+    if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

Dockerfile.apache.node16

@@ -1,12 +1,16 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
 
-ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli"
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli"
 FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH

Dockerfile.cli

@@ -1,26 +1,31 @@
+#syntax=docker/dockerfile-upstream:1
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-ARG FROM_IMAGE="thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache"
+ARG REPO="thecodingmachine/php"
+ARG TAG_PREFIX=""
+ARG FROM_IMAGE="${REPO}:${TAG_PREFIX}:${PHP_VERSION}-${GLOBAL_VERSION}-cli"
 FROM $FROM_IMAGE
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG TARGETOS
 ARG TARGETARCH
 ARG BLACKFIRE_VERSION=1
+ARG NODE_VERSION=16
 
 USER root
 
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg && \
-    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
     apt-get update && \
     apt-get install -y --no-install-recommends nodejs && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get update && \
     apt-get install -y --no-install-recommends yarn && \
-    npm install -g npm@^6.14 && \
+    if [[ "${NODE_VERSION}" == "10" ]]; then npm install -g npm@^6.14; else npm install -g npm; fi && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*