Revert "CD Action change to push multi-arch images for documents-api (#…

…2399)" (#2400) This reverts commit fdda58b.
AOT-Technologies · Dec 4, 2024 · 5571130 · 5571130
1 parent fdda58b
commit 5571130
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/forms-flow-documents-cd.yml b/.github/workflows/forms-flow-documents-cd.yml
@@ -75,33 +75,34 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ matrix.name }}-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-${{ matrix.name }}
-
+      
       - name: Build and push Docker image
         if: ${{ github.ref != 'refs/heads/master' }}
         uses: docker/build-push-action@v4
         with:
           context: forms-flow-documents
           push: true
-          file: |
-            forms-flow-documents/Dockerfile
-            forms-flow-documents/Dockerfile-ARM64
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}      
-
+          labels: ${{ steps.meta.outputs.labels }}
       - name: Build and push Docker image
         if: ${{ github.ref == 'refs/heads/master' }}
         uses: docker/build-push-action@v4
         with:
           context: forms-flow-documents
-          file: |
-            forms-flow-documents/Dockerfile
-            forms-flow-documents/Dockerfile-ARM64
           push: true
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-documents-api:latest
           labels: ${{ steps.meta.outputs.labels }}
-
+      - name: Build and push Docker image - arm64
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-documents
+          file: forms-flow-documents/Dockerfile-ARM64
+          push: true
+          platforms: linux/arm64/v8
+          tags: ${{ steps.meta.outputs.tags }}-arm64
+          labels: ${{ steps.meta.outputs.labels }}
       - name: Scan Docker image 🐳
         uses: snyk/actions/docker@master
         continue-on-error: true

diff --git a/forms-flow-documents/Dockerfile-ARM64 b/forms-flow-documents/Dockerfile-ARM64
@@ -1,5 +1,5 @@
 #Author: Kurian Benoy
-FROM python:3.12.6-slim
+FROM python:python:3.12.6-slim
 
 WORKDIR /forms-flow-documents/app
 
@@ -52,4 +52,4 @@ RUN pip install -e .
 
 EXPOSE 5006
 RUN chmod u+x ./entrypoint
-ENTRYPOINT ["/bin/sh", "entrypoint"]
+ENTRYPOINT ["/bin/sh", "entrypoint"]