Feature/buildx bake

.github/workflows/workflow.yml

@@ -14,78 +14,35 @@ jobs:
   build_test_maybe_release:
     strategy:
       matrix:
-        include:
-          - variant: 'cli'
-            php_version: '8.1'
-          - variant: 'apache'
-            php_version: '8.1'
-          - variant: 'fpm'
-            php_version: '8.1'
-          - variant: 'cli'
-            php_version: '8.0'
-          - variant: 'apache'
-            php_version: '8.0'
-          - variant: 'fpm'
-            php_version: '8.0'
-          - variant: 'cli'
-            php_version: '7.4'
-          - variant: 'apache'
-            php_version: '7.4'
-          - variant: 'fpm'
-            php_version: '7.4'
-          - variant: 'cli'
-            php_version: '7.3'
-          - variant: 'apache'
-            php_version: '7.3'
-          - variant: 'fpm'
-            php_version: '7.3'
-          - variant: 'cli'
-            php_version: '7.2'
-          - variant: 'apache'
-            php_version: '7.2'
-          - variant: 'fpm'
-            php_version: '7.2'
+        variant: ['cli','apache','fpm']
+        php_version: ['8.1','8.0','7.4', '7.3','7.2']
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - uses: actions/checkout@v1
-      - name: Build and test
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Build locally
         run: |
-          PHP_VERSION="${{ matrix.php_version }}" BRANCH="v4" VARIANT="${{ matrix.variant }}" ./build-and-test.sh
-          docker images | grep thecodingmachine/php
+          PHP_VERSION="${{ matrix.php_version }}"
+          docker buildx bake --load \
+            --set "*.platform=$(uname -p)" \
+            php${PHP_VERSION//.}-${{ matrix.variant }} 
+          docker images --filter=reference=thecodingmachine/php
       - 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: Release
+      - name: Build and push to repository
         # Merge ~ push.
         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
-          # 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"
-          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-slim-${BRANCH_VARIANT} thecodingmachine/php:${PHP_PATCH_VERSION}-v4-slim-${BRANCH_VARIANT}
-          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT} thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}
-          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10
-          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12
-          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node14 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14
-          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node16 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node16
-          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-slim-${BRANCH_VARIANT}
-          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}
-          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10
-          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12
-          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14
-          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node16
+          PHP_VERSION="${{ matrix.php_version }}"
+          PHP_PATCH_VERSION=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-${BRANCH_VARIANT} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
+          TAG=${PHP_PATCH_VERSION} docker buildx bake --push \
+            php${PHP_VERSION//.}-${{ matrix.variant }} 

Dockerfile.apache

@@ -3,7 +3,16 @@ ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-apache
+
+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 <[email protected]>, David Négrier <[email protected]>"
 

Dockerfile.apache.node10

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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 - && \

Dockerfile.apache.node12

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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_12.x | bash - && \

Dockerfile.apache.node14

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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 - && \

Dockerfile.apache.node16

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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_16.x | bash - && \

Dockerfile.cli

@@ -3,7 +3,16 @@ ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-cli
+
+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 <[email protected]>, David Négrier <[email protected]>"
 

Dockerfile.cli.node10

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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 - && \

Dockerfile.cli.node12

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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_12.x | bash - && \

Dockerfile.cli.node14

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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 - && \

Dockerfile.cli.node16

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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_16.x | bash - && \

Dockerfile.fpm

@@ -3,7 +3,16 @@ ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-slim-fpm
+
+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 <[email protected]>, David Négrier <[email protected]>"
 

Dockerfile.fpm.node10

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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 - && \

Dockerfile.fpm.node12

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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_12.x | bash - && \

Dockerfile.fpm.node14

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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 - && \

Dockerfile.fpm.node16

@@ -1,12 +1,18 @@
 # DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
-FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
+ARG TARGETOS
+ARG TARGETARCH
+ARG BLACKFIRE_VERSION=1
+
+FROM --platform=$BUILDPLATFORM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
 
 LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
 
 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_16.x | bash - && \