fix: create main image with ubi suffix (#1619)

Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>

.github/workflows/publish.yml

@@ -82,10 +82,24 @@ jobs:
           username: ${{ secrets.GHCR_USERNAME }}
           password: ${{ secrets.GHCR_TOKEN }}
 
+      - name: Get docker image tag
+        id: container_info
+        shell: bash
+        env:
+          GITHUB_REF: ${{ github.ref }}
+        run: |
+          if [ "$GITHUB_REF" == "refs/heads/main" ]; then
+            TAG=main
+          else
+            TAG=$(make docker.tag)
+          fi
+          echo "::set-output name=image-tag::${TAG}"
+
       - name: Build & Publish Artifacts
         if: env.IS_FORK == 'false'
         shell: bash
         env:
+          VERSION: ${{ steps.container_info.outputs.image-tag }}
           BUILD_ARGS: >-
             --push
             --platform linux/amd64,linux/arm64
@@ -95,17 +109,10 @@ jobs:
         if: env.IS_FORK == 'true'
         shell: bash
         env:
+          VERSION: ${{ steps.container_info.outputs.image-tag }}
           BUILD_ARGS: --load
         run: make docker.build
 
-      - name: Get docker image tag
-        id: container_info
-        shell: bash
-        run: |
-          IMAGE=$(make docker.image)
-          TAG=$(make docker.tag)
-          echo "::set-output name=image-tag::${TAG}"
-
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:

Makefile

@@ -228,7 +228,7 @@ docker.push: ## Push the docker image to the registry
 
 # RELEASE_TAG is tag to promote. Default is promoting to main branch, but can be overriden
 # to promote a tag to a specific version.
-RELEASE_TAG ?= main$(TAG_SUFFIX)
+RELEASE_TAG ?= $(IMAGE_TAG)
 SOURCE_TAG ?= $(VERSION)$(TAG_SUFFIX)
 
 docker.promote: ## Promote the docker image to the registry