WIP

somleng · Sep 20, 2024 · 72d5153 · 72d5153
1 parent 37b2b79
commit 72d5153
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/client_gateway.yml b/.github/workflows/client_gateway.yml
@@ -31,7 +31,7 @@ jobs:
           [
             {
               "identifier": "client-gateway-staging",
-              "branch": "develop",
+              "branch": "fix_docker_build",
               "friendly_image_tag": "beta",
               "image_tag": "stag-${{ github.sha }}",
               "ecs_service": "client-gateway-staging",
@@ -105,6 +105,7 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ matrix.identifier }}
           tags: |
             ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.image_tag }}
+            ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}-amd64
             ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}
 
   deploy:

diff --git a/.github/workflows/gateway_commons.yml b/.github/workflows/gateway_commons.yml
@@ -21,7 +21,7 @@ jobs:
           [
             {
               "identifier": "gateway-commons-staging",
-              "branch": "develop",
+              "branch": "fix_docker_build",
               "friendly_image_tag": "beta",
               "image_tag": "stag-${{ github.sha }}"
             },
@@ -83,11 +83,12 @@ jobs:
         with:
           context: components/opensips_scheduler
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           cache-from: type=gha,scope=${{ matrix.identifier }}-gateway-scheduler
           cache-to: type=gha,mode=max,scope=${{ matrix.identifier }}-gateway-scheduler
           tags: |
             ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_SCHEDULER_REPOSITORY_NAME }}:${{ matrix.image_tag }}
+            ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_SCHEDULER_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}-amd64
             ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_SCHEDULER_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}
 
       - name: Build and push Gateway
@@ -100,4 +101,5 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.identifier }}-gateway
           cache-to: type=gha,mode=max,scope=${{ matrix.identifier }}-gateway
           tags: |
+            ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:bootstrap-amd64
             ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:bootstrap
diff --git a/.github/workflows/public_gateway.yml b/.github/workflows/public_gateway.yml
@@ -106,13 +106,9 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.identifier }}
           cache-to: type=gha,mode=max,scope=${{ matrix.identifier }}
           tags: |
-            ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}-amd64
+            ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.image_tag }}
             ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}-amd64
-
-      - name: Build Manifest
-        run: |
-          docker buildx imagetools create -t ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }} -t ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.image_tag }} -t ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }} ${{ secrets.ECR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}-amd64
-          docker buildx imagetools create -t ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }} ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}-amd64
+            ${{ secrets.GHCR_REGISTRY }}/${{ env.GATEWAY_REPOSITORY_NAME }}:${{ matrix.friendly_image_tag }}
 
   deploy:
     name: Deploy