From b0be74d3ca324be20c55a8259539ada08c4e3ea6 Mon Sep 17 00:00:00 2001
From: darefjev44 <71537609+darefjev44@users.noreply.github.com>
Date: Sat, 20 Apr 2024 15:09:51 +0100
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3af39a1a9..3a4bbf3bb 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -47,9 +47,8 @@ jobs:
   ecr-deploy:
     needs: docker-build
     runs-on: ubuntu-latest
-    
     steps:
-    #push to ecr
+    #aws authentication
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v1
       with:
@@ -61,12 +60,13 @@ jobs:
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v1
 
+    #image setup
+    - name: Pull Docker image from GHCR
+      run: docker pull ghcr.io/${{ github.repository }}/${{ needs.docker-build.outputs.docker_tag }}
+
     - name: Tag the image for ECR
-      run: |
-        docker tag ${{ needs.docker-build.outputs.docker_tag }} ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/spring-petclinic:latest
-    
-      
+      run: docker tag ${{ needs.docker-build.outputs.docker_tag }} ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/spring-petclinic:latest
+
+    #push image
     - name: Push image to Amazon ECR
       run: docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/spring-petclinic:latest
-    
-