fixup! ci: Work with image tarballs that are not tagged as 'latest'

freedomofpress · Dec 9, 2024 · 585e23f · 585e23f
1 parent 056bd70
commit 585e23f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -99,5 +99,5 @@ jobs:
           gunzip -c share/container.tar.gz | podman load
           tag=$(cat share/image-id.txt)
           podman push \
-                  dangerzone.rocks/dangerzone \
-                  ${{ env.IMAGE_REGISTRY }}/dangerzone/dangerzone:$tag
+                  dangerzone.rocks/dangerzone:$tag \
+                  ${{ env.IMAGE_REGISTRY }}/dangerzone/dangerzone:tag
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -31,7 +31,7 @@ jobs:
         uses: anchore/scan-action@v5
         id: scan_container
         with:
-          image: "dangerzone.rocks/dangerzone:{{ steps.tag.outputs.tag }}"
+          image: "dangerzone.rocks/dangerzone:${{ steps.tag.outputs.tag }}"
           fail-build: false
           only-fixed: false
           severity-cutoff: critical
@@ -45,8 +45,7 @@ jobs:
       - name: Scan container image
         uses: anchore/scan-action@v5
         with:
-          image: "dangerzone.rocks/dangerzone:{{ steps.tag.outputs.tag }}"
-          fail-build: false
+          image: "dangerzone.rocks/dangerzone:${{ steps.tag.outputs.tag }}"
           fail-build: true
           only-fixed: false
           severity-cutoff: critical

diff --git a/.github/workflows/scan_released.yml b/.github/workflows/scan_released.yml
@@ -35,8 +35,7 @@ jobs:
         uses: anchore/scan-action@v5
         id: scan_container
         with:
-          image: "dangerzone.rocks/dangerzone:{{ steps.tag.outputs.tag }}"
-          fail-build: false
+          image: "dangerzone.rocks/dangerzone:${{ steps.tag.outputs.tag }}"
           fail-build: false
           only-fixed: false
           severity-cutoff: critical
@@ -50,7 +49,7 @@ jobs:
       - name: Scan container image
         uses: anchore/scan-action@v5
         with:
-          image: "dangerzone.rocks/dangerzone:{{ steps.tag.outputs.tag }}"
+          image: "dangerzone.rocks/dangerzone:${{ steps.tag.outputs.tag }}"
           fail-build: true
           only-fixed: false
           severity-cutoff: critical