Merge branch 'main' into 323-use-forecasttoolslocation_table-instead-…

…of-downloading-populations
CDCgov · Feb 5, 2025 · ba2e6f5 · ba2e6f5
2 parents 8a62432 + 0e84d49
commit ba2e6f5
Showing 1 changed file with 5 additions and 26 deletions.
diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml
@@ -11,7 +11,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  REGISTRY: cfaprdbatchcr.azurecr.io/
   IMAGE_NAME: pyrenew-hew
 
 jobs:
@@ -21,36 +20,16 @@ jobs:
     name: Build and push image
 
     steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # From: https://stackoverflow.com/a/58035262/2097171
-      - name: Extract branch name
-        run: |
-          echo "name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> \
-            $GITHUB_OUTPUT
-        id: branch
-
-      - name: Figure out tag (either latest if it is main or the branch name)
-        id: image
-        run: |
-          if [ "${{ steps.branch.outputs.name }}" = "main" ]; then
-            echo "tag=latest" >> $GITHUB_OUTPUT
-          else
-            echo "tag=${{ steps.branch.outputs.name }}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Building and push the image
-        id: build-image
+      - name: Build and push image
+        id: build-push
         uses: CDCgov/cfa-actions/[email protected]
         with:
           container-file-1: ./Containerfile.dependencies
           container-file-2: ./Containerfile
           first-step-cache-key: docker-dependencies-${{ runner.os }}-${{ hashFiles('./Containerfile.dependencies') }}
-          registry: ${{ env.REGISTRY }}
-          username: cfaprdbatchcr
-          password: ${{ secrets.CFAPRDBATCHCR_REGISTRY_PASSWORD }}
+          registry: ${{ vars.CONTAINER_REGISTRY }}
+          username: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
+          password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
           image: ${{ env.IMAGE_NAME }}
           build-args-2: |
             TAG=${{ steps.image.outputs.tag }}