Hotfix push patched

Author: mistraloz

.github/workflows/workflow.yml

@@ -14,8 +14,8 @@ jobs:
   build_test_maybe_release:
     strategy:
       matrix:
-        php_version: ['8.1','8.0','7.4', '7.3','7.2']
-        variant: ['apache','cli','fpm']
+        php_version: ['8.1'] #,'8.0'] #,'7.4', '7.3','7.2']
+        variant: ['apache'] #,'cli','fpm']
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
@@ -24,23 +24,23 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Checkout
         uses: actions/checkout@v1
-#      - name: Build locally
-#        run: |
-#          PHP_VERSION="${{ matrix.php_version }}"
-#          docker buildx bake --load \
-#            --set "*.platform=linux/amd64" \
-#            php${PHP_VERSION//.}-slim-${{ matrix.variant }}
-#          docker buildx bake --load \
-#            --set "*.platform=linux/amd64" \
-#            php${PHP_VERSION//.}-${{ matrix.variant }}-all
-#          PHP_VERSION_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-cli php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
-#          echo "PHP_VERSION_MINOR=${PHP_VERSION_MINOR}" >> $GITHUB_ENV
-#          echo "PHP Version : ${PHP_VERSION_MINOR}" >> $GITHUB_STEP_SUMMARY
-#          docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY
-#      - name: Test ${{ matrix.variant }}
-#        run:  |
-#          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} ./test-image.sh
-#          echo "${{ matrix.variant }} variant OK" >> $GITHUB_STEP_SUMMARY
+      - name: Build locally
+        run: |
+          PHP_VERSION="${{ matrix.php_version }}"
+          docker buildx bake --load --no-cache \
+            --set "*.platform=linux/amd64" \
+            php${PHP_VERSION//.}-slim-${{ matrix.variant }}
+          docker buildx bake --load \
+            --set "*.platform=linux/amd64" \
+            php${PHP_VERSION//.}-${{ matrix.variant }}-all
+          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
+          echo "PHP Version : ${PHP_VERSION_MINOR}" >> $GITHUB_STEP_SUMMARY
+          docker images --filter=reference=thecodingmachine/php >> $GITHUB_STEP_SUMMARY
+      - name: Test ${{ matrix.variant }}
+        run:  |
+          PHP_VERSION="${{ matrix.php_version }}" BRANCH=v4 VARIANT=${{ matrix.variant }} ./test-image.sh
+          echo "${{ matrix.variant }} variant OK" >> $GITHUB_STEP_SUMMARY
       - name: Login to DockerHub
         # Merge ~ push.
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
@@ -53,11 +53,7 @@ jobs:
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         run: |
           PHP_VERSION="${{ matrix.php_version }}"
-          docker buildx bake \
-            --set "*.platform=linux/amd64,linux/arm64" \
-            --set "*.output=type=registry" \
-            php${PHP_VERSION//.}-slim-${{ matrix.variant }}
-          PHP_PATCH_MINOR=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-cli php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1` \
+          PHP_PATCH_MINOR="{{ .env.PHP_VERSION_MINOR }}" \
           docker buildx bake \
             --set "*.platform=linux/amd64,linux/arm64" \
             --set "*.output=type=registry" \

Dockerfile.slim.apache

@@ -366,7 +366,7 @@ ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
  && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
  && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
     elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
+    else echo "Target arch '$TARGETARCH' is not supported"; fi \
  && curl -fsSLO "$SUPERCRONIC_URL" \
  && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
  && chmod +x "$SUPERCRONIC" \

Dockerfile.slim.cli

@@ -271,7 +271,7 @@ ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
  && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
  && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
     elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
+    else echo "Target arch '$TARGETARCH' is not supported"; fi \
  && curl -fsSLO "$SUPERCRONIC_URL" \
  && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
  && chmod +x "$SUPERCRONIC" \

Dockerfile.slim.fpm

@@ -294,7 +294,7 @@ ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
  && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
  && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
     elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
+    else echo "Target arch '$TARGETARCH' is not supported"; fi \
  && curl -fsSLO "$SUPERCRONIC_URL" \
  && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
  && chmod +x "$SUPERCRONIC" \

utils/Dockerfile.slim.blueprint

@@ -395,7 +395,7 @@ ONBUILD RUN if [ -n "$INSTALL_CRON" ]; then \
  && SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85 \
  && if [ "$TARGETARCH" == "arm64" ]; then SUPERCRONIC_SHA1SUM=e2714c43e7781bf1579c85aa61259245f56dbba1; \
     elif [ "$TARGETARCH" == "amd64" ]; then SUPERCRONIC_SHA1SUM=5ddf8ea26b56d4a7ff6faecdd8966610d5cb9d85; \
-    else echo "Target arch '$TARGETARCH' is not supported"; fi; \
+    else echo "Target arch '$TARGETARCH' is not supported"; fi \
  && curl -fsSLO "$SUPERCRONIC_URL" \
  && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
  && chmod +x "$SUPERCRONIC" \