From 651dfdfadcb4bac68238de1a0d89c3e7d581ef65 Mon Sep 17 00:00:00 2001
From: Michele Sica <33629436+MicheleSica@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:44:43 +0200
Subject: [PATCH] Update .github-ci.yaml new configuration

---
 .github/workflows/.github-ci.yaml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/.github-ci.yaml b/.github/workflows/.github-ci.yaml
index d96f411..7cc0919 100644
--- a/.github/workflows/.github-ci.yaml
+++ b/.github/workflows/.github-ci.yaml
@@ -63,7 +63,6 @@ jobs:
       run: |
         tag="${docker_image_application}:${docker_image_version}"
         echo "${{ secrets.CR_PASSWORD }}" | docker login -u "${{ secrets.CR_USERNAME }}" --password-stdin "${{ secrets.CR_REGISTRY }}"
-        echo "build ${{ secrets.CR_REGISTRY }}/${{ secrets.CR_REPO }}"/"${tag}"
         docker build -t "${{ secrets.CR_REGISTRY }}/${{ secrets.CR_REPO }}"/"${tag}" --file Dockerfile .          
 
     # Step 7: Save Docker image as tar.gz
@@ -87,9 +86,7 @@ jobs:
         tag="${docker_image_application}:${docker_image_version}"
         echo "${{ secrets.CR_PASSWORD }}" | docker login -u "${{ secrets.CR_USERNAME }}" --password-stdin "${{ secrets.CR_REGISTRY }}"
         trivy image --no-progress --exit-code 1 --severity HIGH,CRITICAL,UNKNOWN --format table "${{ secrets.CR_REGISTRY }}/${{ secrets.CR_REPO }}/${tag}"
-        exit code 1
-
-
+       
     # Step 10: Login Docker Hub
     - name: Login to Docker Hub
       uses: docker/login-action@v2
@@ -140,12 +137,6 @@ jobs:
       run: |
         branch_name=${GITHUB_BRANCH#refs/heads/}
         echo "branch_name=${GITHUB_BRANCH#refs/heads/}" >> $GITHUB_ENV
-        if [[ "$branch_name" = "main" ]]
-        then
-          mType=""
-        else
-          mType="dev"
-        fi
         echo "docker_tag=$docker_image_name:$docker_image_version" >> $GITHUB_ENV
         echo "docker_tag_latest=$docker_image_name:latest" >> $GITHUB_ENV 
         docker_image_application=(${docker_image_name#*/})