From aff7d5e67e04bfcefefde584e41b456ecb4de837 Mon Sep 17 00:00:00 2001
From: Yanis JEDRZEJCZAK <yanis.jedrzejczak@smart-chain.fr>
Date: Thu, 23 May 2024 11:44:24 +0200
Subject: [PATCH] Adding tags to images

---
 .github/workflows/ppd.yml |  9 ++++++---
 .github/workflows/prd.yml |  9 ++++++---
 .github/workflows/stg.yml | 11 ++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ppd.yml b/.github/workflows/ppd.yml
index 2864eeb6..1c410bcb 100644
--- a/.github/workflows/ppd.yml
+++ b/.github/workflows/ppd.yml
@@ -33,10 +33,13 @@ jobs:
             username: nologin
             password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
             registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+        - name: Get Git Commit SHA
+          id: vars
+          run: echo "COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
         - name: Build the Docker Image
-          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
         - name: Push the Docker Image to Scaleway Container Registry
-          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
   deploy-to-scaleway-lecoffre:
     needs: build-and-push-image-lecoffre
     runs-on: ubuntu-latest
@@ -65,7 +68,7 @@ jobs:
               fi
             done <<< "$ENV_VARS"
             env_string=$(echo $env_string | sed 's/ $//')
-            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+            scw container container update ${{ env.CONTAINER_ID }} $env_string registry-image ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}     
         env:
           ENV_VARS: ${{ secrets.ENV }}
           SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
diff --git a/.github/workflows/prd.yml b/.github/workflows/prd.yml
index e9102294..b412540a 100644
--- a/.github/workflows/prd.yml
+++ b/.github/workflows/prd.yml
@@ -34,10 +34,13 @@ jobs:
             username: nologin
             password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
             registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+        - name: Get Git Commit SHA
+          id: vars
+          run: echo "COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
         - name: Build the Docker Image
-          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
         - name: Push the Docker Image to Scaleway Container Registry
-          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
   deploy-to-scaleway-lecoffre:
     needs: build-and-push-image-lecoffre
     runs-on: ubuntu-latest
@@ -66,7 +69,7 @@ jobs:
               fi
             done <<< "$ENV_VARS"
             env_string=$(echo $env_string | sed 's/ $//')
-            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+            scw container container update ${{ env.CONTAINER_ID }} $env_string registry-image ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}     
         env:
           ENV_VARS: ${{ secrets.ENV }}
           SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
diff --git a/.github/workflows/stg.yml b/.github/workflows/stg.yml
index 703da63b..5276f1dd 100644
--- a/.github/workflows/stg.yml
+++ b/.github/workflows/stg.yml
@@ -5,11 +5,9 @@ on:
     branches: [staging]
 
 env:
-  
   PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
   NAMESPACE_ID_LECOFFRE: f8137e85-47ad-46a5-9e2e-18af5de829c5
   CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffrestgbqbfhtv6
-
   IMAGE_NAME: front
   CONTAINER_NAME: front
 
@@ -34,10 +32,13 @@ jobs:
           username: nologin
           password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
           registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+      - name: Get Git Commit SHA
+        id: vars
+        run: echo "COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: Build the Docker Image
-        run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+        run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
       - name: Push the Docker Image to Scaleway Container Registry
-        run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+        run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
   deploy-to-scaleway-lecoffre:
     needs: build-and-push-image-lecoffre
     runs-on: ubuntu-latest
@@ -66,7 +67,7 @@ jobs:
               fi
             done <<< "$ENV_VARS"
             env_string=$(echo $env_string | sed 's/ $//')
-            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+            scw container container update ${{ env.CONTAINER_ID }} $env_string registry-image ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
         env:
           ENV_VARS: ${{ secrets.ENV }}
           SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}