Merge pull request #117 from cyber-dojo/simplify-last-step-of-workflow

Simplify last step of main workflow
cyber-dojo · Jan 22, 2025 · 1825c1a · 1825c1a
2 parents 5445260 + c4ac979
commit 1825c1a
Showing 1 changed file with 17 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,8 +32,6 @@ env:
   AWS_ECR_ID: ${{ vars.AWS_ECR_ID }}
   AWS_REGION: ${{ vars.AWS_REGION }}
   DOCKER_API_VERSION: ${{ vars.DOCKER_API_VERSION }}
-  DOCKER_USER: ${{ secrets.DOCKER_USER }}
-  DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
   SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
   IMAGE_TAR_FILENAME: /tmp/${{ github.event.repository.name }}:${{ github.sha }}.tar
 
@@ -465,35 +463,32 @@ jobs:
   push-latest:
     runs-on: ubuntu-latest
     needs: [setup, deploy-to-prod]
-    permissions:
-      id-token: write
-      contents: write
+    env:
+      IMAGE_NAME: ${{ needs.setup.outputs.image_name }}
     steps:
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+      - name: Retrieve Docker image from cache
+        uses: actions/cache@v4
         with:
-          aws-region: ${{ needs.setup.outputs.aws_region }}
-          role-duration-seconds: 900
-          role-session-name: ${{ github.event.repository.name }}
-          role-to-assume: arn:aws:iam::${{ needs.setup.outputs.aws_account_id }}:role/${{ needs.setup.outputs.gh_actions_iam_role_name }}
-          mask-aws-account-id: no
+          path: ${{ env.IMAGE_TAR_FILENAME }}
+          key: ${{ env.IMAGE_NAME }}
 
-      - name: Login to Amazon ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+      - name: Load Docker image
+        run:
+          docker image load --input "${IMAGE_TAR_FILENAME}"
 
       - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Tag image to :latest and push to Dockerhub Registry
+      - name: Tag images and push to Dockerhub
         env:
-          IMAGE_NAME: ${{ needs.setup.outputs.image_name }}
           IMAGE_TAG: ${{ needs.setup.outputs.image_tag }}
         run: |
-          docker pull "${IMAGE_NAME}"
-          docker tag "${IMAGE_NAME}" "cyberdojo/${SERVICE_NAME}:${IMAGE_TAG}"
-          docker tag "${IMAGE_NAME}" "cyberdojo/${SERVICE_NAME}:latest"
-          docker push "cyberdojo/${SERVICE_NAME}:${IMAGE_TAG}"
-          docker push "cyberdojo/${SERVICE_NAME}:latest"
+          TAGGED="cyberdojo/${SERVICE_NAME}:${IMAGE_TAG}"
+          docker tag "${IMAGE_NAME}" "${TAGGED}"
+          docker push "${TAGGED}"
+          
+          LATEST="cyberdojo/${SERVICE_NAME}:latest"
+          docker tag "${IMAGE_NAME}" "${LATEST}"
+          docker push "${LATEST}"