From 5f82aeb930dc71029bae9420e5a792bef3628652 Mon Sep 17 00:00:00 2001
From: Steve Yonkeu <yokwejuste@yahoo.com>
Date: Sun, 18 Aug 2024 12:57:54 +0100
Subject: [PATCH 1/2] updates to workflow

---
 .github/workflows/main_dj237-api.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main_dj237-api.yml b/.github/workflows/main_dj237-api.yml
index fcf67ae..750c4fd 100644
--- a/.github/workflows/main_dj237-api.yml
+++ b/.github/workflows/main_dj237-api.yml
@@ -10,6 +10,7 @@ env:
   AZURE_CONTAINER_REGISTRY_USERNAME: ${{ secrets.AZURE_CONTAINER_REGISTRY_USERNAME }}
   AZURE_CONTAINER_REGISTRY_PASSWORD: ${{ secrets.AZURE_CONTAINER_REGISTRY_PASSWORD }}
   APP_NAME: ${{ secrets.APP_NAME }}
+  IMAGE_TAG: ${{ github.sha }}
 
 jobs:
   build-and-push:

From ef92ebf40364fd337efefd5db106685e11b0afac Mon Sep 17 00:00:00 2001
From: Steve Yonkeu <yokwejuste@yahoo.com>
Date: Sun, 18 Aug 2024 13:12:06 +0100
Subject: [PATCH 2/2] updates to workflow

---
 .github/workflows/main_dj237-api.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main_dj237-api.yml b/.github/workflows/main_dj237-api.yml
index 750c4fd..46cbeba 100644
--- a/.github/workflows/main_dj237-api.yml
+++ b/.github/workflows/main_dj237-api.yml
@@ -15,45 +15,45 @@ env:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-
+    
     outputs:
       image_tag: ${{ steps.get-image-tag.outputs.image_tag }}
-
+    
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
+      
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.6.1
-
+      
       - name: Get short commit SHA
         id: get-image-tag
         run: echo "image_tag=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
+      
       - name: Log in to Azure Container Registry
         uses: azure/docker-login@v2
         with:
           login-server: ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}
           username: ${{ env.AZURE_CONTAINER_REGISTRY_USERNAME }}
           password: ${{ env.AZURE_CONTAINER_REGISTRY_PASSWORD }}
-
+      
       - name: Create .env file from secret
         run: echo "${{ secrets.PROJECT_SECRET }}" > .env
-
+      
       - name: Build and tag Docker image
         run: |
           docker build -f config/docker/Dockerfile -t ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:latest .
           docker tag ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:latest ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:${{ env.IMAGE_TAG }}
-
+      
       - name: Push Docker image to ACR
         run: |
           docker push ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:latest
           docker push ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:${{ env.IMAGE_TAG }}
-
+  
   deploy:
     runs-on: ubuntu-latest
     needs: build-and-push
-
+    
     steps:
       - name: Log in to Azure Container Registry
         uses: azure/docker-login@v2
@@ -61,8 +61,8 @@ jobs:
           login-server: ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}
           username: ${{ env.AZURE_CONTAINER_REGISTRY_USERNAME }}
           password: ${{ env.AZURE_CONTAINER_REGISTRY_PASSWORD }}
-
+      
       - name: Pull and deploy the pinned Docker image
         run: |
-          docker pull ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:${{ needs.build-and-push.outputs.image_tag }}
-          docker run -d --name ${{ env.APP_NAME }} --restart always -p 8000:8000 ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:${{ needs.build-and-push.outputs.image_tag }}
+          docker pull ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:latest
+          docker run -d --name ${{ env.APP_NAME }} --restart always -p 8000:8000 ${{ env.AZURE_CONTAINER_REGISTRY_LOGIN_SERVER }}/${{ env.APP_NAME }}:latest