From 408ffa167597d35d3057f2cfc0a0efcb4dd2b6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Nussbaumer?=
 <clement.nussbaumer@postfinance.ch>
Date: Wed, 23 Nov 2022 06:54:56 +0100
Subject: [PATCH] build(gh-action): simplify pipeline and prevent push old
 images

---
 .../{goreleaser.yaml => hostlookuper.yaml}    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
 rename .github/workflows/{goreleaser.yaml => hostlookuper.yaml} (78%)

diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/hostlookuper.yaml
similarity index 78%
rename from .github/workflows/goreleaser.yaml
rename to .github/workflows/hostlookuper.yaml
index c06e76c..a454ff0 100644
--- a/.github/workflows/goreleaser.yaml
+++ b/.github/workflows/hostlookuper.yaml
@@ -1,4 +1,4 @@
-name: goreleaser
+name: hostlookuper
 
 on:
   pull_request:
@@ -33,7 +33,7 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: postfinance
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
@@ -43,16 +43,18 @@ jobs:
           args: release --rm-dist --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+      - name: List snapshot images
+        run: |
+          docker image ls --format "{{.Repository}}:{{.Tag}}" | \
+            grep -e "$GITHUB_REPOSITORY:.*$(git rev-parse --short HEAD).*" | \
+            paste -sd ' ' /dev/stdin > images
       - name: Push snapshot images
         run: |
-          docker image ls --format "{{.Repository}}:{{.Tag}}" | grep hostlookuper | xargs -I{} docker push  '{}'
-
+          cat images | xargs -d ' ' -I{} -n1 sh -c "docker push {}"
       - name: Create and push manifest for :snapshot tag
         run: |
-          docker image ls --format "{{.Repository}}:{{.Tag}}" | grep hostlookuper | paste -sd ' ' /dev/stdin > images
-          docker manifest create postfinance/hostlookuper:snapshot $(cat images)
-          docker manifest push postfinance/hostlookuper:snapshot
+          docker manifest create $GITHUB_REPOSITORY:snapshot $(cat images)
+          docker manifest push $GITHUB_REPOSITORY:snapshot
 
   release:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -70,9 +72,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: postfinance
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with: