Fix docker build with slash in repo name

Moulick · Mar 2, 2024 · 6dc50d7 · 6dc50d7
1 parent 592dcce
commit 6dc50d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -40,13 +40,15 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Convert slash in branch name
-        run: echo ::set-env name=BRANCH_NAME::$(echo ${{ github.head_ref }} | tr / -)
+        run: |
+          BRANCH_NAME=$(echo ${{ github.head_ref }} | tr / -)
+          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
 
       - name: Build${{ github.ref_name == 'master' && ' and push' || '' }}
         uses: docker/build-push-action@v4
         with:
           context: .
           push: ${{ github.ref_name == 'master'}}
-          tags: moulick/debug-image:${{ github.ref_name == 'master' && 'latest' || env.BRANCH_NAME }}
+          tags: docker.io/moulick/debug-image:${{ github.ref_name == 'master' && 'latest' || env.BRANCH_NAME }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -55,12 +55,12 @@ jobs:
 
       - name: Build an image from Dockerfile
         run: |
-          docker build -t docker.io/moulick/ingress-whitelister:${{ github.sha }} .
+          docker build -t docker.io/moulick/debug-image:${{ github.sha }} .
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'docker.io/moulick/ingress-whitelister:${{ github.sha }}'
+          image-ref: 'docker.io/moulick/debug-image:${{ github.sha }}'
           format: 'sarif'
           output: 'trivy-oci-image.sarif'
           severity: 'CRITICAL,HIGH'