Ecrtest 3 (#10)

* update dockerfile for test

* make architecture easier to manage

* attempt without arch file

Also, cleanup and expand the summary output

Author: cabutlermit

.github/workflows/dev-build.yml

@@ -16,14 +16,41 @@ permissions:
   contents: read
 
 jobs:
+  prep:
+    runs-on: ubuntu-latest
+    outputs: 
+      cpuarch: ${{ steps.setarch.outputs.cpuarch }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Set CPU Architecture
+        id: setarch
+        run: |
+          echo "### Architecture Selection" >> $GITHUB_STEP_SUMMARY
+          if [[ -f .aws-architecture ]]; then
+            ARCH=$(cat .aws-architecture)
+            echo "\`$ARCH\` was read from \`.aws-architecture\` and passed to the deploy job." >> $GITHUB_STEP_SUMMARY
+          else
+            ARCH="linux/amd64"
+            echo "No \`.aws-architecture\` file, so default \`$ARCH\` was passed to the deploy job." >> $GITHUB_STEP_SUMMARY
+          fi
+          if [[ "$ARCH" != "linux/arm64" && "$ARCH" != "linux/amd64" ]]; then
+            echo "$ARCH is INVALID architecture!"
+            echo "$ARCH is INVALID architecture!" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "cpuarch=$ARCH" >> $GITHUB_OUTPUT
+
   deploy:
+    needs: prep
     name: Dev Container Deploy
     uses: mitlibraries/.github/.github/workflows/ecr-multi-arch-deploy-dev.yml@multi-arch-deploy
     secrets: inherit
     with:
       AWS_REGION: "us-east-1"
       GHA_ROLE: "ecr-workflow-test-gha-dev"
       ECR: "ecr-workflow-test-dev"
-      CPU_ARCH: "linux/arm64"
+      CPU_ARCH: ${{ needs.prep.outputs.cpuarch }}
       # FUNCTION: ""
       # PREBUILD: 

.github/workflows/stage-build.yml

@@ -16,14 +16,41 @@ permissions:
   contents: read
 
 jobs:
+  prep:
+    runs-on: ubuntu-latest
+    outputs: 
+      cpuarch: ${{ steps.setarch.outputs.cpuarch }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Set CPU Architecture
+        id: setarch
+        run: |
+          echo "### Architecture Selection" >> $GITHUB_STEP_SUMMARY
+          if [[ -f .aws-architecture ]]; then
+            ARCH=$(cat .aws-architecture)
+            echo "\`$ARCH\` was read from \`.aws-architecture\` and passed to the deploy job." >> $GITHUB_STEP_SUMMARY
+          else
+            ARCH="linux/amd64"
+            echo "No \`.aws-architecture\` file, so default \`$ARCH\` was passed to the deploy job." >> $GITHUB_STEP_SUMMARY
+          fi
+          if [[ "$ARCH" != "linux/arm64" && "$ARCH" != "linux/amd64" ]]; then
+            echo "$ARCH is INVALID architecture!"
+            echo "$ARCH is INVALID architecture!" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "cpuarch=$ARCH" >> $GITHUB_OUTPUT
+
   deploy:
+    needs: prep
     name: Stage Container Deploy
     uses: mitlibraries/.github/.github/workflows/ecr-multi-arch-deploy-stage.yml@multi-arch-deploy
     secrets: inherit
     with:
       AWS_REGION: "us-east-1"
       GHA_ROLE: "ecr-workflow-test-gha-stage"
       ECR: "ecr-workflow-test-stage"
-      CPU_ARCH: "linux/arm64"
+      CPU_ARCH: ${{ needs.prep.outputs.cpuarch }}
       # FUNCTION: ""
       # PREBUILD: 

Makefile

@@ -3,9 +3,9 @@ DATETIME:=$(shell date -u +%Y%m%dT%H%M%SZ)
 ### This is the Terraform-generated header for ecr-workflow-test-dev. If  ###
 ###   this is a Lambda repo, uncomment the FUNCTION line below            ###
 ###   and review the other commented lines in the document.               ###
-ECR_NAME_DEV:=ecr-workflow-test-dev
-ECR_URL_DEV:=222053980223.dkr.ecr.us-east-1.amazonaws.com/ecr-workflow-test-dev
-CPU_ARCH:=linux/arm64
+ECR_NAME_DEV := ecr-workflow-test-dev
+ECR_URL_DEV := 222053980223.dkr.ecr.us-east-1.amazonaws.com/ecr-workflow-test-dev
+CPU_ARCH ?= $(shell cat .aws-architecture)
 ### End of Terraform-generated header                                     ###
 
 help: # Preview Makefile commands