Added manual script push due to ECR login issues (#101)

SADEAFxSMU · Oct 1, 2020 · 089abff · 089abff
1 parent f0c4ae1
commit 089abff
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/.github/workflows/aws_ecs_deploy.yml b/.github/workflows/aws_ecs_deploy.yml
@@ -12,37 +12,40 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: olegtarasov/get-tag@v2
-
       -
-        name: Login to ECR
-        uses: docker/login-action@v1
+        name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
         with:
-          registry: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
-          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      -
+        name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
       -
-        name: Build sadeaf-hasura and push into ECR
+        name: Build sadeaf-hasura docker image
         uses: docker/build-push-action@v1
         with:
           path: sadeaf-hasura
-          registry: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
+          registry: ${{ steps.login-ecr.outputs.registry }}
           repository: sadeafxsmu/sadeaf-hasura
           tag_with_ref: true
+          push: false
       -
-        name: Build sadeaf-web and push into ECR
+        name: Build sadeaf-web docker image
         uses: docker/build-push-action@v1
         with:
           path: sadeaf-web
-          registry: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
+          registry: ${{ steps.login-ecr.outputs.registry }}
           repository: sadeafxsmu/sadeaf-web
           tag_with_ref: true
+          push: false
       -
-        name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
+        name: Push images to ECR
+        run: |
+          docker push ${{ steps.login-ecr.outputs.registry }}/sadeafxsmu/sadeaf-hasura:$GIT_TAG_NAME
+          docker push ${{ steps.login-ecr.outputs.registry }}/sadeafxsmu/sadeaf-web:$GIT_TAG_NAME
       -
         name: Download task definition
         run: |