From 1e9458cee076edaf75f25b61bade2abe11e51d26 Mon Sep 17 00:00:00 2001
From: bbuechle <btbuechler@alaska.edu>
Date: Wed, 22 May 2024 20:33:19 -0600
Subject: [PATCH 1/2] some cleanup

---
 .github/workflows/build_image.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build_image.yaml b/.github/workflows/build_image.yaml
index 8d4dd39..210f6e0 100644
--- a/.github/workflows/build_image.yaml
+++ b/.github/workflows/build_image.yaml
@@ -16,13 +16,9 @@ env:
 jobs:
 
   build-and-push-image:
-
     runs-on: ubuntu-latest
 
-    environment: ${{ needs.setup.outputs.environment }}
-
     env:
-      DEPLOY_PREFIX: ${{ needs.setup.outputs.deploy_prefix }}
       AWS_DEFAULT_REGION: us-west-2
       BASE_IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
 

From 3f19cb69074688e46542ef20bcc253028392f9ca Mon Sep 17 00:00:00 2001
From: bbuechle <btbuechler@alaska.edu>
Date: Wed, 22 May 2024 20:38:09 -0600
Subject: [PATCH 2/2] shuffle

---
 .github/workflows/build_image.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_image.yaml b/.github/workflows/build_image.yaml
index 210f6e0..29613ae 100644
--- a/.github/workflows/build_image.yaml
+++ b/.github/workflows/build_image.yaml
@@ -8,10 +8,6 @@ on:
     tags:
       - "v*.*.*"
 
-env:
-  REGISTRY: ghcr.io/asfadmin
-  IMAGE_NAME: mapready
-  TAG_NAME: ${{ github.ref_name }}
 
 jobs:
 
@@ -19,8 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
+      REGISTRY: ghcr.io/asfadmin
       AWS_DEFAULT_REGION: us-west-2
-      BASE_IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
+      IMAGE_NAME: mapready
+      TAG_NAME: ${{ github.ref_name }}
 
     permissions:
       contents: read
@@ -43,4 +41,4 @@ jobs:
           context: .
           file: build/asf_mapready.Dockerfile
           push: true
-          tags: ${{ env.BASE_IMAGE }}
\ No newline at end of file
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
\ No newline at end of file