Merge pull request #37 from MITLibraries/INFRA-629

Adjust workflow command

Author: tim-rix

.github/workflows/dev-build.yml

@@ -1,10 +1,6 @@
 ### This is the Terraform-generated dev-build.yml workflow for the          ###
 ### docker-matomo-dev app repository.                                       ###
-name: Dev Container Build and Deploy
-
-# checkov:skip=CKV2_GHA_1:The shared workflow contains the permissions constraints
-# NOTE: The above checkov skip command doesn't actually work and this workflow
-#       will always show a checkov warning.
+name: Dev Build and Push ECR Image
 on:
   workflow_dispatch:
   pull_request:
@@ -13,12 +9,19 @@ on:
     paths-ignore:
       - '.github/**'
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
-  deploy:
-    name: Dev Container Deploy
-    uses: mitlibraries/.github/.github/workflows/ecr-shared-deploy-dev.yml@INFRA-526
+  build-push:
+    name: Dev Build and Push Image
+    uses: mitlibraries/.github/.github/workflows/ecr-multi-arch-deploy-dev.yml@main
     secrets: inherit
     with:
       AWS_REGION: "us-east-1"
       GHA_ROLE: "docker-matomo-gha-dev"
       ECR: "docker-matomo-dev"
+      # DOCKERFILE: # only if the name of the Dockerfile is not "Dockerfile"!
+      # FUNCTION: "" # only if this is a container-based Lambda function
+      # PREBUILD:  # only if there is some pre-build dependency

.github/workflows/prod-promote.yml

@@ -1,27 +1,23 @@
 ### This is the Terraform-generated prod-promote.yml workflow for the       ###
 ### docker-matomo-prod repository.                                          ###
 
-name: Prod Container Promote
-
-# checkov:skip=CKV2_GHA_1:The shared workflow contains the permissions constraints
-# NOTE: The above checkov skip command doesn't actually work and this workflow
-#       will always show a checkov warning.
-
+name: Prod Promote Image
 on:
   workflow_dispatch:
   release:
     types: [published]
 
 jobs:
-  deploy:
-    name: Prod Container Promote
-    uses: mitlibraries/.github/.github/workflows/ecr-shared-promote-prod.yml@INFRA-526
+  promote:
+    name: Prod Promote Container
+    uses: mitlibraries/.github/.github/workflows/ecr-multi-arch-promote-prod.yml@main
     secrets: inherit
     with:
       AWS_REGION: "us-east-1"
-      GHA_ROLE_STAGE: docker-matomo-gha-stage
-      GHA_ROLE_PROD: docker-matomo-gha-prod
-      ECR_STAGE: "docker-matomo-stage"
+      GHA_ROLE_STAGE: "docker-matomo-gha-prod"
+      GHA_ROLE_PROD: "docker-matomo-gha-prod"
+      ECR_STAGE: "docker-matomo-prod"
       ECR_PROD: "docker-matomo-prod"
-      # FUNCTION: ""
- 
+      # DEFAULT_BRANCH: # Only if the default branch is not "main"!
+      # FUNCTION: "" # only if this is a container-based Lambda function
+      

.github/workflows/stage-build.yml

@@ -1,11 +1,6 @@
 ### This is the Terraform-generated dev-build.yml workflow for the          ###
 ### docker-matomo-stage app repository.                                     ###
-name: Stage Container Build and Deploy
-
-# checkov:skip=CKV2_GHA_1:The shared workflow contains the permissions constraints
-# NOTE: The above checkov skip command doesn't actually work and this workflow
-#       will always show a checkov warning.
-
+name: Stage Build and Push ECR Image
 on:
   workflow_dispatch:
   push:
@@ -14,13 +9,19 @@ on:
     paths-ignore:
       - '.github/**'
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
-  deploy:
-    name: Stage Container Deploy
-    uses: mitlibraries/.github/.github/workflows/ecr-shared-deploy-stage.yml@INFRA-526
+  build-push:
+    name: Stage Build and Push Image
+    uses: mitlibraries/.github/.github/workflows/ecr-multi-arch-deploy-stage.yml@main
     secrets: inherit
     with:
       AWS_REGION: "us-east-1"
       GHA_ROLE: "docker-matomo-gha-stage"
       ECR: "docker-matomo-stage"
- 
+      # DOCKERFILE: # only if the name of the Dockerfile is not "Dockerfile"!
+      # FUNCTION: "" # only if this is a container-based Lambda function
+      # PREBUILD:  # only if there is some pre-build dependency