From 7ac420dc28159b33a3afa167f2b676357440b24c Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@grafana.com>
Date: Tue, 28 Jan 2025 15:01:01 +0000
Subject: [PATCH] fix: Tag images with the bare version.

---
 .github/workflows/build_and_publish.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml
index 86d4b518f..eef73d811 100644
--- a/.github/workflows/build_and_publish.yaml
+++ b/.github/workflows/build_and_publish.yaml
@@ -36,8 +36,9 @@ jobs:
 
     container:
       image: ghcr.io/grafana/grafana-build-tools:v0.36.0@sha256:deec32592848cde11ff64b4a5803b85546027dfb7b98921a0d0b89cd2226612f
-    outputs:
-      version: ${{ steps.version.outputs.value }}
+    outputs
+      version: ${{ steps.version.outputs.value }}:
+      version_bare: ${{ steps.version.outputs.barevalue }}
 
     steps:
       - name: checkout
@@ -73,6 +74,7 @@ jobs:
         run: |
           make version
           echo "value=$(cat dist/version)" >> "$GITHUB_OUTPUT"
+          echo "barevalue=$(cat dist/version | cut -d- -f1)" >> "$GITHUB_OUTPUT"
 
       - name: build
         run: make build-native
@@ -213,6 +215,7 @@ jobs:
           platforms: ${{ steps.extract-build-artifacts.outputs.platforms }}
           tags: |-
             type=raw,value=${{ needs.validate.outputs.version }}
+            type=raw,value=${{ needs.validate.outputs.version_bare }}
             type=sha,prefix=sha-,format=short
             latest
           file: Dockerfile.no-browser
@@ -226,6 +229,7 @@ jobs:
           platforms: ${{ steps.extract-build-artifacts.outputs.platforms }}
           tags: |-
             type=raw,value=${{ needs.validate.outputs.version }}-browser
+            type=raw,value=${{ needs.validate.outputs.version_bare }}-browser
             type=sha,prefix=sha-,suffix=-browser,format=short
             latest-browser
           file: Dockerfile.browser