fix: Build failed for php 8.2.19

ronisaha · Jul 1, 2024 · 9ce8160 · 9ce8160
1 parent 14c0c63
commit 9ce8160
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -9,7 +9,10 @@ on:
 jobs:
   push:
     runs-on: ubuntu-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        image-variant: [ 'apache', 'cli', 'fpm', 'supervisor', 'dev' ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -20,19 +23,21 @@ jobs:
 
       - name: Build and push the images
         run: |
-          for dockerFilePath in $(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} ${{ github.event.before }} | grep "Dockerfile");
-          do
-            folder=${dockerFilePath%"/Dockerfile"}
-            VERSION=${folder##*/}
-            PHP_VERSION=8.2.20
+          VERSION=${{ matrix.image-variant }}
+          PHP_SHORT_VERSION=8.2
+          PHP_VERSION=8.2.19
 
-            tmpName="image-$RANDOM"
-            cp -r fonts $folder/
-            docker build $folder --file $folder/Dockerfile --tag $tmpName --build-arg PHP_VERSION=$PHP_VERSION 
-            IMAGE_ID=${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_USERNAME }}/${{ secrets.IMAGE_NAME }}
+          tmpName="image-$RANDOM"
+          docker build $VERSION --file $VERSION/Dockerfile --tag $tmpName --build-arg PHP_VERSION=$PHP_VERSION
+          if [ $? -ne 0 ]; then 
+          echo "Docker build failed, for ${VERSION}-$PHP_VERSION"
+            exit 1
+          fi
+          IMAGE_ID=${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_USERNAME }}/${{ secrets.IMAGE_NAME }}
 
-            docker tag $tmpName $IMAGE_ID:$VERSION
-            docker push $IMAGE_ID:$VERSION
-            docker tag $tmpName $IMAGE_ID:${VERSION}-$PHP_VERSION
-            docker push $IMAGE_ID:${VERSION}-$PHP_VERSION
-          done;
+          docker tag $tmpName $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
+          docker tag $tmpName $IMAGE_ID:${VERSION}-$PHP_VERSION
+          docker push $IMAGE_ID:${VERSION}-$PHP_VERSION
+          docker tag $tmpName $IMAGE_ID:${VERSION}-$PHP_SHORT_VERSION
+          docker push $IMAGE_ID:${VERSION}-$PHP_SHORT_VERSION
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2.20
+ARG PHP_VERSION=8.2.19
 FROM php:${PHP_VERSION}-apache-bullseye
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
@@ -69,7 +69,7 @@ RUN set -eux; \
 	wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip \
     ;\
     unzip instantclient-basiclite-linuxx64.zip ; \
-    unzip instantclient-sdk-linuxx64.zip ;\
+    unzip -o instantclient-sdk-linuxx64.zip ;\
     rm -f instantclient-basiclite-linuxx64.zip; \
     rm -f instantclient-sdk-linuxx64.zip; \
     mv instantclient*/ /usr/lib/instantclient; \

diff --git a/cli/Dockerfile b/cli/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2.20
+ARG PHP_VERSION=8.2.19
 FROM php:${PHP_VERSION}-cli-bullseye
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
@@ -66,7 +66,7 @@ RUN set -eux; \
 	wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip \
     ;\
     unzip instantclient-basiclite-linuxx64.zip ; \
-    unzip instantclient-sdk-linuxx64.zip ;\
+    unzip -o instantclient-sdk-linuxx64.zip ;\
     rm -f instantclient-basiclite-linuxx64.zip; \
     rm -f instantclient-sdk-linuxx64.zip; \
     mv instantclient*/ /usr/lib/instantclient; \

diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2.20
+ARG PHP_VERSION=8.2.19
 FROM php:${PHP_VERSION}-apache-bullseye
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
@@ -69,7 +69,7 @@ RUN set -eux; \
 	wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip \
     ;\
     unzip instantclient-basiclite-linuxx64.zip ; \
-    unzip instantclient-sdk-linuxx64.zip ;\
+    unzip -o instantclient-sdk-linuxx64.zip ;\
     rm -f instantclient-basiclite-linuxx64.zip; \
     rm -f instantclient-sdk-linuxx64.zip; \
     mv instantclient*/ /usr/lib/instantclient; \

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2.20
+ARG PHP_VERSION=8.2.19
 FROM php:${PHP_VERSION}-fpm-bullseye
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
@@ -64,7 +64,7 @@ RUN set -eux; \
 	wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip \
     ;\
     unzip instantclient-basiclite-linuxx64.zip ; \
-    unzip instantclient-sdk-linuxx64.zip ;\
+    unzip -o instantclient-sdk-linuxx64.zip ;\
     rm -f instantclient-basiclite-linuxx64.zip; \
     rm -f instantclient-sdk-linuxx64.zip; \
     mv instantclient*/ /usr/lib/instantclient; \

diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2.20
+ARG PHP_VERSION=8.2.19
 FROM php:${PHP_VERSION}-cli-bullseye
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
@@ -64,7 +64,7 @@ RUN set -eux; \
 	wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip \
     ;\
     unzip instantclient-basiclite-linuxx64.zip ; \
-    unzip instantclient-sdk-linuxx64.zip ;\
+    unzip -o instantclient-sdk-linuxx64.zip ;\
     rm -f instantclient-basiclite-linuxx64.zip; \
     rm -f instantclient-sdk-linuxx64.zip; \
     mv instantclient*/ /usr/lib/instantclient; \