Reenable merge to master image update in ECR for preview environments (…

…#12431) Co-authored-by: Curt Bonade <cbonade@Curts-MacBook-Pro.local>
department-of-veterans-affairs · Apr 18, 2023 · 6b05356 · 6b05356
1 parent c32247b
commit 6b05356
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/preview-environment-update-main.yml b/.github/workflows/preview-environment-update-main.yml
@@ -23,20 +23,20 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-gov-west-1
 
-      # - name: Login to ECR # Update ECR credentials if necessary
-      #   id: login-ecr
-      #   uses: aws-actions/amazon-ecr-login@v1
+      - name: Login to ECR # Update ECR credentials if necessary
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
 
-      # - name: Build Docker Image #use "file" input to designate alternate dockerfile path. Defaults to "Dockerfile": https://github.com/docker/build-push-action
-      #   uses: docker/build-push-action@v2
-      #   with:
-      #     build-args: |
-      #       userid=${{ env.VETS_API_USER_ID }}
-      #     context: .
-      #     # target: production
-      #     push: true
-      #     # Update tags and ECR Repository
-      #     tags: |
-      #       ${{ steps.login-ecr.outputs.registry }}/dsva/preview-environment/vets-api:latest
-      #     # cache-from: type=registry,ref=$ECR_REGISTRY/$ECR_REPOSITORY
-      #     # cache-to: type=inline
+      - name: Build Docker Image #use "file" input to designate alternate dockerfile path. Defaults to "Dockerfile": https://github.com/docker/build-push-action
+        uses: docker/build-push-action@v2
+        with:
+          build-args: |
+            userid=${{ env.VETS_API_USER_ID }}
+          context: .
+          # target: production
+          push: true
+          # Update tags and ECR Repository
+          tags: |
+            ${{ steps.login-ecr.outputs.registry }}/dsva/preview-environment/vets-api:latest
+          # cache-from: type=registry,ref=$ECR_REGISTRY/$ECR_REPOSITORY
+          # cache-to: type=inline
diff --git a/.github/workflows/preview_environment_deployment.yml b/.github/workflows/preview_environment_deployment.yml
@@ -44,7 +44,7 @@ jobs:
         with:
           step: start
           token: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}
-          env: master/main/${{ github.ref_name }}
+          env: ${{ github.ref_name }}/main/main
           ref: ${{ github.ref_name }}
 
       - name: Get Source Repo and Source Ref