From a7856c06c002c3d3dcaa680a171688bfdcdda214 Mon Sep 17 00:00:00 2001
From: Armel Soro <asoro@redhat.com>
Date: Fri, 16 Feb 2024 18:22:33 +0100
Subject: [PATCH] Fix tags for images built for main and release branches

As discussed in [1], this would allow to run `make deploy` out of the box, as the image corresponding to the VERSION in Makefile would be present.

[1] https://github.com/janus-idp/operator/pull/200#discussion_r1489312876
---
 .github/workflows/next-container-build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/next-container-build.yaml b/.github/workflows/next-container-build.yaml
index 5c142a67..91b7d827 100644
--- a/.github/workflows/next-container-build.yaml
+++ b/.github/workflows/next-container-build.yaml
@@ -98,7 +98,8 @@ jobs:
           if [[ $(git rev-parse --abbrev-ref HEAD) != "main" ]]; then
             latestNext="latest" 
           fi
-          export VERSION=${{ env.BASE_VERSION }}-${latestNext}-${{ env.SHORT_SHA }}
+
+          export VERSION=${{ env.BASE_VERSION }}
 
           set -ex
 
@@ -108,7 +109,6 @@ jobs:
           # now copy images from local cache to quay, using 0.0.1-next-f00cafe, 0.0.1-next, and next tags
           for image in operator operator-bundle operator-catalog; do
             podman push quay.io/janus-idp/${image}:${VERSION} -q
-            skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION}
-            skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION%-*}
+            skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${VERSION}-${{ env.SHORT_SHA }}
             skopeo --insecure-policy copy --all docker://quay.io/janus-idp/${image}:${VERSION} docker://quay.io/janus-idp/${image}:${latestNext}
           done