fix(ci): fix build

tgagor · Dec 15, 2024 · 7fe162c · 7fe162c
1 parent 4f84722
commit 7fe162c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
           curl -fLo /usr/local/bin/td https://github.com/tgagor/template-dockerfiles/releases/latest/download/td-linux-amd64
           chmod +x /usr/local/bin/td
 
-          td --config build.yaml --tag $DOCKER_TAG --push
+          td --config build.yaml --tag ${DOCKER_TAG}-${{ github.sha }} --push
 
   security-scan:
     runs-on: ubuntu-latest
@@ -61,7 +61,7 @@ jobs:
         run: |
           echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
 
-          docker pull ghcr.io/tgagor/centos:${{ matrix.tag }}
+          docker pull ghcr.io/tgagor/centos:${{ matrix.tag }}-${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master

diff --git a/build.yaml b/build.yaml
@@ -24,8 +24,8 @@ images:
     tags:
       - centos:{{ .centos }}
       - centos:{{ .centos | trimPrefix "stream" }}
-      - centos:{{ .tag }}-{{ .centos }}
-      - centos:{{ .tag }}
+      - centos:{{ .tag | splitList "-" | first }}-{{ .centos }}
+      - centos:{{ .tag | splitList "-" | first }}
       - centos:stream
       - centos:latest
     labels: