From fd915fd3fe533d843b17cbd2d5a9ece5d9b390ba Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Mon, 25 Nov 2024 13:26:33 +0100
Subject: [PATCH] ci: create release docker image through workflow-call

---
 .github/workflows/docker.yml         | 14 +++++++++-----
 .github/workflows/release-please.yml | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 06903bd8a..56b9cea6b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,15 +5,18 @@ on:
   push:
     branches:
       - main
-    tags:
-      - v*
   pull_request:
     branches:
       - "*"
     paths-ignore:
       - "docs/**"
       - ".github/workflows/publish-page.yml"
-  merge_group:
+  merge_group: {}
+  workflow_call:
+    inputs:
+      tag:
+        type: string
+        required: true
 
 permissions:
   contents: read
@@ -23,9 +26,9 @@ env:
   REGISTRY_IMAGE: grafana/tanka
   # Docker image tags. See https://github.com/docker/metadata-action for format
   TAGS_CONFIG: |
-    type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
     type=sha,prefix={{branch}}-,format=short,enable=${{ github.ref == 'refs/heads/main' }}
-    type=semver,pattern={{version}}
+    type=raw,value=latest,enable=${{ inputs.tag != '' }}
+    type=semver,pattern={{version}},value=${{ inputs.tag }},enable=${{ inputs.tag != '' }}
 
 jobs:
   build:
@@ -41,6 +44,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 67a786c36..bd3facd48 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -29,6 +29,18 @@ jobs:
           manifest-file: .release-please-manifest.json
           github-token: ${{ github.secret }}
 
+  release-docker-image:
+    needs:
+      - release-please
+    if: needs.release-please.outputs.release_created
+    permissions:
+      contents: write
+      pull-requests: write
+      id-token: write
+    uses: ./.github/workflows/docker.yml
+    with:
+      tag: ${{ needs.release-please.outputs.release_tag }}
+
   # If a release was created, also create the binaries and attach them
   release-binaries:
     runs-on: ubuntu-latest