fix ecr image tagging

aws-samples · Mar 28, 2024 · 50781b6 · 50781b6
1 parent f3c75c7
commit 50781b6
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/.github/workflows/base-images.yml b/.github/workflows/base-images.yml
@@ -7,9 +7,9 @@ name: Base Image Builds
 
 on:
   push:
-    branches: ['base-images', 'docker-builds']
+    branches: ['main', 'base-images', 'docker-builds']
   pull_request:
-    branches: ['base-images', 'docker-builds']
+    branches: ['main', 'base-images', 'docker-builds']
     types: [opened, closed]
 
 env:
@@ -53,7 +53,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBUNTU }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBUNTU }}-amd64:latest
           platforms: linux/amd64
   build-base-docker-image-ubuntu-arm64:
     runs-on: ubuntu-latest
@@ -86,7 +86,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBUNTU }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBUNTU }}-arm64:latest
           platforms: linux/arm64
   build-base-docker-image-ubuntu-armv7:
     runs-on: ubuntu-latest
@@ -119,7 +119,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBUNTU }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBUNTU }}-armv7:latest
           platforms: linux/arm/v7
   build-base-docker-image-ubi8-amd64:
     runs-on: ubuntu-latest
@@ -150,7 +150,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBI8 }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBI8 }}-amd64:latest
           platforms: linux/amd64
   build-base-docker-image-ubi8-arm64:
     runs-on: ubuntu-latest
@@ -181,7 +181,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBI8 }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_UBI8 }}-arm64:latest
           platforms: linux/arm64
   build-base-docker-image-amazonlinux-amd64:
     runs-on: ubuntu-latest
@@ -212,7 +212,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_AMAZONLINUX }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_AMAZONLINUX }}-amd64:latest
           platforms: linux/amd64
   build-base-docker-image-amazonlinux-arm64:
     runs-on: ubuntu-latest
@@ -243,7 +243,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_AMAZONLINUX }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_AMAZONLINUX }}-arm64:latest
           platforms: linux/arm64
   build-base-docker-image-debian-amd64:
     runs-on: ubuntu-latest
@@ -276,7 +276,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_DEBIAN }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_DEBIAN }}-amd64:latest
           platforms: linux/amd64
   build-base-docker-image-debian-arm64:
     runs-on: ubuntu-latest
@@ -309,7 +309,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_DEBIAN }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_DEBIAN }}-arm64:latest
           platforms: linux/arm64
   build-base-docker-image-fedora-amd64:
     runs-on: ubuntu-latest
@@ -340,5 +340,5 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_FEDORA }}:latest
+            ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_BASE_FEDORA }}-amd64:latest
           platforms: linux/amd64