From 17b2ab8d0ca12fe3abec023610e86042d1fa4f0a Mon Sep 17 00:00:00 2001
From: "David E. Wheeler" <david.wheeler@tembo.io>
Date: Thu, 23 Jan 2025 19:14:53 -0500
Subject: [PATCH] Fix docker tag

---
 .github/workflows/publish-trunk.yaml | 10 +++++-----
 trunk/Dockerfile                     |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-trunk.yaml b/.github/workflows/publish-trunk.yaml
index 95cc706..16dae32 100644
--- a/.github/workflows/publish-trunk.yaml
+++ b/.github/workflows/publish-trunk.yaml
@@ -28,12 +28,12 @@ jobs:
           username: ${{ secrets.QUAY_USER_TEMBO }}
           password: ${{ secrets.QUAY_PASSWORD_TEMBO }}
       - name: Push to Quay
-        if: github.ref_name == 'main'
+        # if: github.ref_name == 'main'
         shell: bash
         run: |
           set -xe
           TAG="$(perl -nE '/TRUNK_VER\s*=\s*(.+)/ && do { print $1; exit }' trunk/Dockerfile)"
-          docker tag $IMAGE_NAME ${{ secrets.QUAY_REPOSITORY }}/trunk:$TAG
-          docker push $IMAGE_NAME ${{ secrets.QUAY_REPOSITORY }}/trunk:$TAG
-          docker tag $IMAGE_NAME ${{ secrets.QUAY_REPOSITORY }}/trunk:latest
-          docker push $IMAGE_NAME ${{ secrets.QUAY_REPOSITORY }}/trunk:latest
+          docker tag trunk ${{ secrets.QUAY_REPOSITORY }}/trunk:$TAG
+          docker push ${{ secrets.QUAY_REPOSITORY }}/trunk:$TAG
+          docker tag trunk ${{ secrets.QUAY_REPOSITORY }}/trunk:latest
+          docker push ${{ secrets.QUAY_REPOSITORY }}/trunk:latest
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
index 894e266..5a87fdd 100644
--- a/trunk/Dockerfile
+++ b/trunk/Dockerfile
@@ -6,3 +6,4 @@ RUN cargo install --version $TRUNK_VER pg-trunk
 
 FROM scratch
 COPY --from=build /usr/local/cargo/bin/trunk .
+