Add github-ci for multiarch build

mistraloz · mistraloz · commit 0e39d90ac39d · 2022-07-22T09:50:22.000+02:00
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -54,7 +54,8 @@ jobs:
       - uses: actions/checkout@v1
       - name: Build and test
         run: |
-          PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4" VARIANT="${{ matrix.variant }}" ./build-and-test.sh
+          PLATFORM="linux/amd64" PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4" VARIANT="${{ matrix.variant }}" ./build-and-test.sh
+          PUSH=0 PLATFORM="linux/arm64" PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4" VARIANT="${{ matrix.variant }}" ./build-load-or-push.sh
           docker images | grep thecodingmachine/php
       - name: Login to DockerHub
         # Merge ~ push.
@@ -68,12 +69,7 @@ jobs:
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         run: |
           BRANCH_VARIANT=`echo "${{ matrix.variant }}" | sed 's/\./-/g'`
-          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-slim-${BRANCH_VARIANT}
-          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}
-          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10
-          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12
-          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node14
-          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node16
+          PUSH=1 PLATFORM="linux/amd64,linux/arm64" PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4" VARIANT="${{ matrix.variant }}" ./build-load-or-push.sh
           # Let's also tag PHP patch releases
           PHP_PATCH_VERSION=`docker run --rm thecodingmachine/php:${{ matrix.php_version }}-v4-slim-${BRANCH_VARIANT} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
           echo "Tagging patch release $PHP_PATCH_VERSION"
diff --git a/Dockerfile.apache b/Dockerfile.apache
@@ -1,17 +1,17 @@
 # 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
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache
 
-ONBUILD ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
-ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
-
+ONBUILD ARG TARGETOS
+ONBUILD ARG TARGETARCH
+ONBUILD ARG BLACKFIRE_VERSION=1
 ENV CONTAINER_OS=${TARGETOS}
 ENV CONTAINER_ARCH=${TARGETARCH}
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.apache.node10 b/Dockerfile.apache.node10
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
diff --git a/Dockerfile.apache.node12 b/Dockerfile.apache.node12
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
diff --git a/Dockerfile.apache.node14 b/Dockerfile.apache.node14
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
diff --git a/Dockerfile.apache.node16 b/Dockerfile.apache.node16
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,17 +1,17 @@
 # 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
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli
 
-ONBUILD ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
-ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
-
+ONBUILD ARG TARGETOS
+ONBUILD ARG TARGETARCH
+ONBUILD ARG BLACKFIRE_VERSION=1
 ENV CONTAINER_OS=${TARGETOS}
 ENV CONTAINER_ARCH=${TARGETARCH}
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.cli.node10 b/Dockerfile.cli.node10
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
diff --git a/Dockerfile.cli.node12 b/Dockerfile.cli.node12
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
diff --git a/Dockerfile.cli.node14 b/Dockerfile.cli.node14
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
diff --git a/Dockerfile.cli.node16 b/Dockerfile.cli.node16
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
diff --git a/Dockerfile.fpm b/Dockerfile.fpm
@@ -1,17 +1,17 @@
 # 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
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm
 
-ONBUILD ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
-ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
-
+ONBUILD ARG TARGETOS
+ONBUILD ARG TARGETARCH
+ONBUILD ARG BLACKFIRE_VERSION=1
 ENV CONTAINER_OS=${TARGETOS}
 ENV CONTAINER_ARCH=${TARGETARCH}
+ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.fpm.node10 b/Dockerfile.fpm.node10
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
diff --git a/Dockerfile.fpm.node12 b/Dockerfile.fpm.node12
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
diff --git a/Dockerfile.fpm.node14 b/Dockerfile.fpm.node14
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
diff --git a/Dockerfile.fpm.node16 b/Dockerfile.fpm.node16
@@ -1,8 +1,9 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-ARG TARGETOS TARGETARCH BLACKFIRE_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
 
 FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache
@@ -1,5 +1,4 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 FROM --platform=$BUILDPLATFORM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -12,10 +11,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ARG PHP_VERSION
 ENV PHP_VERSION=$PHP_VERSION
-ONBUILD ARG TARGETOS TARGETARCH
-ARG TARGETOS TARGETARCH
-
+ONBUILD ARG TARGETOS
+ONBUILD ARG TARGETARCH
+ONBUILD ARG BLACKFIRE_VERSION=1
 ARG BLACKFIRE_VERSION=1
+ARG TARGETOS
+ARG TARGETARCH
+
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 # |--------------------------------------------------------------------------
diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli
@@ -1,5 +1,4 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 FROM --platform=$BUILDPLATFORM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -12,10 +11,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ARG PHP_VERSION
 ENV PHP_VERSION=$PHP_VERSION
-ONBUILD ARG TARGETOS TARGETARCH
-ARG TARGETOS TARGETARCH
-
+ONBUILD ARG TARGETOS
+ONBUILD ARG TARGETARCH
+ONBUILD ARG BLACKFIRE_VERSION=1
 ARG BLACKFIRE_VERSION=1
+ARG TARGETOS
+ARG TARGETARCH
+
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 # |--------------------------------------------------------------------------
diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm
@@ -1,5 +1,4 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
-
 FROM --platform=$BUILDPLATFORM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -12,10 +11,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ARG PHP_VERSION
 ENV PHP_VERSION=$PHP_VERSION
-ONBUILD ARG TARGETOS TARGETARCH
-ARG TARGETOS TARGETARCH
-
+ONBUILD ARG TARGETOS
+ONBUILD ARG TARGETARCH
+ONBUILD ARG BLACKFIRE_VERSION=1
 ARG BLACKFIRE_VERSION=1
+ARG TARGETOS
+ARG TARGETARCH
+
 ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 # |--------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
@@ -1,29 +1,27 @@
 blueprint: ## Generate all blueprints file
 	@if ! type orbit >/dev/null 2>&1; then echo "Missing orbit dependency, please install from https://github.com/gulien/orbit/"; exit 1; fi
 	orbit run generate
-	@sed -i '1i\# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)' Dockerfile.*
-	@sed -i '1i\[DO NOT EDIT THIS FILE]: <> (Make yours changes in /utils/README.blueprint.md)' README.md
 
 test-latest: test-8.0 ## Test the latest build only
 
 _test-prerequisites: blueprint
 	docker pull ubuntu:20.04
 
 test-quick: _test-prerequisites ## Test 8.0 and 8.1 quickly
-	PHP_VERSION=8.0 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
-	PHP_VERSION=8.1 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	PLATFORM=$$(uname -p) PHP_VERSION=8.0 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	PLATFORM=$$(uname -p) PHP_VERSION=8.1 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
 	notify-send -u critical "Tests passed with success"
 
 test-8.1: _test-prerequisites ## Test php8.1 build only
 	docker pull ubuntu:20.04
-	PHP_VERSION=8.1 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
-	PHP_VERSION=8.1 BRANCH=v4 VARIANT=apache ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	PLATFORM=$$(uname -p) PHP_VERSION=8.1 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	PLATFORM=$$(uname -p) PHP_VERSION=8.1 BRANCH=v4 VARIANT=apache ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
 	notify-send -u critical "Tests passed with success"
 
 test-8.0: _test-prerequisites ## Test php8.0 build only
 	docker pull ubuntu:20.04
-	PHP_VERSION=8.0 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
-	PHP_VERSION=8.0 BRANCH=v4 VARIANT=apache ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	PLATFORM=$$(uname -p) PHP_VERSION=8.0 BRANCH=v4 VARIANT=cli ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	PLATFORM=$$(uname -p) PHP_VERSION=8.0 BRANCH=v4 VARIANT=apache ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
 	notify-send -u critical "Tests passed with success"
 
 clean: ## Clean dangles image after build
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+[DO NOT EDIT THIS FILE]: <> (Make yours changes in /utils/README.blueprint.md)
 ![Docker PHP Images GitHub workflow](https://github.com/thecodingmachine/docker-images-php/workflows/Docker%20PHP%20Images%20GitHub%20workflow/badge.svg)
 
 # General purpose PHP images for Docker
diff --git a/build-and-test.sh b/build-and-test.sh
diff --git a/build-load-or-push.sh b/build-load-or-push.sh
diff --git a/orbit.yml b/orbit.yml
diff --git a/utils/Dockerfile.blueprint b/utils/Dockerfile.blueprint
diff --git a/utils/Dockerfile.node.blueprint b/utils/Dockerfile.node.blueprint
diff --git a/utils/Dockerfile.slim.blueprint b/utils/Dockerfile.slim.blueprint
