From 0de8b58f60e2743fd9c6a312a9ce1baf09099b7e Mon Sep 17 00:00:00 2001
From: Robert Fairburn <8029478+rfairburn@users.noreply.github.com>
Date: Thu, 30 Mar 2023 12:46:39 -0500
Subject: [PATCH] Goreleaser quay push to use docker instead of podman (#10830)

This is to resolve #10693 and looks to work when it triggered on the
branch.
---
 .github/workflows/goreleaser-fleet.yaml       | 19 +++++++++++++------
 .../workflows/goreleaser-snapshot-fleet.yaml  | 19 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/goreleaser-fleet.yaml b/.github/workflows/goreleaser-fleet.yaml
index 393eda53a7..1b0e3437ca 100644
--- a/.github/workflows/goreleaser-fleet.yaml
+++ b/.github/workflows/goreleaser-fleet.yaml
@@ -62,12 +62,19 @@ jobs:
           echo "TAG=$(git describe --tags |  sed -e "s/^fleet-//")" >> $GITHUB_OUTPUT
         id: docker
 
-      - name: Push To quay.io
-        id: push-to-quay
-        uses: redhat-actions/push-to-registry@9986a6552bc4571882a4a67e016b17361412b4df # v2.7.1
+      - name: List tags for push
+        run: |
+          echo "The following TAGs are to be pushed: ${{ steps.docker.outputs.TAG }}"
+
+      - name: Login to quay.io
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          image: fleetdm/fleet
-          tags: ${{ steps.docker.outputs.TAG }}
-          registry: quay.io/
+          registry: quay.io
           username: fleetdm+fleetreleaser
           password: ${{ secrets.QUAY_REGISTRY_PASSWORD }}
+
+      - name: Tag and push to quay.io
+        run: |
+          for TAG in ${{ steps.docker.outputs.TAG }}; do
+          docker buildx imagetools create --tag quay.io/fleetdm/fleet:${TAG} fleetdm/fleet:${TAG}
+          done
diff --git a/.github/workflows/goreleaser-snapshot-fleet.yaml b/.github/workflows/goreleaser-snapshot-fleet.yaml
index 00fb10d694..dbee2eb983 100644
--- a/.github/workflows/goreleaser-snapshot-fleet.yaml
+++ b/.github/workflows/goreleaser-snapshot-fleet.yaml
@@ -63,12 +63,19 @@ jobs:
           echo "TAG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT
         id: docker
 
-      - name: Push To quay.io
-        id: push-to-quay
-        uses: redhat-actions/push-to-registry@9986a6552bc4571882a4a67e016b17361412b4df # v2.7.1
+      - name: List tags for push
+        run: |
+          echo "The following TAGs are to be pushed: ${{ steps.docker.outputs.TAG }}"
+
+      - name: Login to quay.io
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          image: fleetdm/fleet
-          tags: ${{ steps.docker.outputs.TAG }}
-          registry: quay.io/
+          registry: quay.io
           username: fleetdm+fleetreleaser
           password: ${{ secrets.QUAY_REGISTRY_PASSWORD }}
+
+      - name: Tag and push to quay.io
+        run: |
+          for TAG in ${{ steps.docker.outputs.TAG }}; do
+          docker buildx imagetools create --tag quay.io/fleetdm/fleet:${TAG} fleetdm/fleet:${TAG}
+          done