From c73187dfc268a4809fd0d22b4f7763aeb2e68523 Mon Sep 17 00:00:00 2001
From: Roni Saha <roni.cse@gmail.com>
Date: Mon, 1 Jul 2024 08:05:41 +0600
Subject: [PATCH] feat: Build OCI images

---
 .github/workflows/docker-publish.yml | 6 ++----
 oci/Dockerfile                       | 2 +-
 supervisor-oci/Dockerfile            | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 265e5c1..44b0b6f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image-variant: [ 'apache', 'cli', 'fpm', 'supervisor', 'dev', 'oci', 'supervisor-oci' ]
+        image-variant: [ 'oci', 'supervisor-oci' ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -24,7 +24,7 @@ jobs:
         run: |
           VERSION=${{ matrix.image-variant }}
           PHP_SHORT_VERSION=8.3
-          PHP_VERSION=8.3.8
+          PHP_VERSION=8.3.7
 
           tmpName="image-$RANDOM"
           docker build $VERSION --file $VERSION/Dockerfile --tag $tmpName --build-arg PHP_VERSION=$PHP_VERSION
@@ -38,8 +38,6 @@ jobs:
           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
           if [ "$VERSION" == "fpm" ]; then 
             docker tag $tmpName $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
diff --git a/oci/Dockerfile b/oci/Dockerfile
index 5df53f3..b6d1f59 100644
--- a/oci/Dockerfile
+++ b/oci/Dockerfile
@@ -51,7 +51,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-oci/Dockerfile b/supervisor-oci/Dockerfile
index 9032f7f..f11ba45 100644
--- a/supervisor-oci/Dockerfile
+++ b/supervisor-oci/Dockerfile
@@ -51,7 +51,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; \