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

---
 .github/workflows/stg.yml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/stg.yml b/.github/workflows/stg.yml
index 66eee834..3a0b7343 100644
--- a/.github/workflows/stg.yml
+++ b/.github/workflows/stg.yml
@@ -33,16 +33,12 @@ jobs:
           password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
           registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
       - name: Get Git Commit SHA
-        id: get_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 }}:${{ env.COMMIT_SHA }}
-        env:
-          COMMIT_SHA: ${{ steps.get_commit_sha.outputs.COMMIT_SHA }}
       - name: Push the Docker Image to Scaleway Container Registry
         run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}
-        env:
-          COMMIT_SHA: ${{ steps.get_commit_sha.outputs.COMMIT_SHA }}
 
   deploy-to-scaleway-lecoffre:
     needs: build-and-push-image-lecoffre
@@ -51,21 +47,17 @@ jobs:
     steps:
       - name: Install CLI
         uses: scaleway/action-scw@v0
-      - name: Verify Commit SHA
-        run: |
-          echo "Deploying image with Commit SHA: ${{ env.COMMIT_SHA }}"
-        env:
-          COMMIT_SHA: ${{ steps.get_commit_sha.outputs.COMMIT_SHA }}
       - name: Get container ID
         run: |
-          CONTAINER_ID=$(scw container container list namespace-id=${{ env.NAMESPACE_ID_LECOFFRE }} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')
-          echo "CONTAINER_ID=${CONTAINER_ID}" >> $GITHUB_ENV
-          echo "Container ID is: ${CONTAINER_ID}"
+          echo "CONTAINER_ID=$(scw container container list namespace-id=${{ env.NAMESPACE_ID_LECOFFRE }} -o json | jq -r '.[] | select(.name == \"${{ env.CONTAINER_NAME }}\") | .id')" >> $GITHUB_ENV
         env:
           SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
           SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
           SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
           SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+      - name: Get Git Commit SHA
+        id: vars
+        run: echo "COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: Deploy the container based on the new image
         run: |
           env_string=""
@@ -79,12 +71,10 @@ jobs:
             fi
           done <<< "$ENV_VARS"
           env_string=$(echo $env_string | sed 's/ $//')
-          echo "Updating container with ID: ${{ env.CONTAINER_ID }} using image: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}:${{ env.COMMIT_SHA }}"
           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 }}
           SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
           SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
-          COMMIT_SHA: ${{ steps.get_commit_sha.outputs.COMMIT_SHA }}
\ No newline at end of file
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
\ No newline at end of file