clean-up image builder

hyperspike · Nov 27, 2024 · 30f0db4 · 30f0db4
1 parent 6aae090
commit 30f0db4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -70,7 +70,7 @@ jobs:
         context: .
         push: true
         visibility: public
-        tags: ${{ steps.meta_manager.outputs.tags }}
+        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}${{ env.RELEASE_VERSION }}
         labels: ${{ steps.meta_manager.outputs.labels }}
     - name: Build and push Sidecar image
       uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
@@ -80,7 +80,7 @@ jobs:
         context: .
         push: true
         visibility: public
-        tags: ${{ steps.meta_sidecar.outputs.tags }}
+        tags: ${{ env.REGISTRY }}/hyperspike/valkey-sidecar:${{ env.RELEASE_VERSION }}
         labels: ${{ steps.meta_sidecar.outputs.labels }}
     - name: Build and push Valkey image
       uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
@@ -90,7 +90,7 @@ jobs:
         context: .
         push: true
         visibility: public
-        tags: ${{ steps.meta_valkey.outputs.tags }}
+        tags: ${{ env.REGISTRY }}/hyperspike/valkey:${{ env.VALKEY_VERSION }}
         labels: ${{ steps.meta_valkey.outputs.labels }}
 
     - name: Set up Cosign

diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
@@ -82,15 +82,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Build and push Valkey image
+    - name: Build the Valkey image
       uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
       id: docker_build_valkey
       with:
         file: Dockerfile.valkey
         context: .
         push: false
         tags:  ${{ env.REGISTRY }}/hyperspike/valkey:${{ github.SHA }}
-
     - name: Run Trivy vulnerability scanner
       uses: aquasecurity/trivy-action@master
       with: