From 8858e4003a5e684bbea57d31bea7748e7c8c96e5 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 11 Apr 2025 17:08:08 +0100
Subject: [PATCH 1/4] Explicitly set docker image version for releases

Otherwise we end up with inconsistency across RCs and Releases.
---
 .github/workflows/publish.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 8735f05d..ab7d1a72 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -60,7 +60,7 @@ jobs:
       artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
       docker_tags: |
         type=sha,format=short,event=branch
-        type=semver,pattern=v{{version}}
+        type=raw,pattern=${{ env.VERSION }}
   add_docker_release_note:
     needs: publish_docker
     name: Add docker release note

From fc281c516c8a889f9e571a1b8c934097e978d4c3 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 11 Apr 2025 17:12:58 +0100
Subject: [PATCH 2/4] Fix error

> Unrecognized named-value: 'env'. Located at position 1 within expression: env.VERSION
---
 .github/workflows/publish.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index ab7d1a72..b43dce83 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -60,7 +60,7 @@ jobs:
       artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
       docker_tags: |
         type=sha,format=short,event=branch
-        type=raw,pattern=${{ env.VERSION }}
+        type=raw,pattern=${{ github.env.VERSION }}
   add_docker_release_note:
     needs: publish_docker
     name: Add docker release note

From 4b247540ef7f3f968431c4e37db3bc83fa66a1df Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 11 Apr 2025 17:16:47 +0100
Subject: [PATCH 3/4] value!=pattern

---
 .github/workflows/publish.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index b43dce83..d2b1bb6c 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -60,7 +60,7 @@ jobs:
       artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
       docker_tags: |
         type=sha,format=short,event=branch
-        type=raw,pattern=${{ github.env.VERSION }}
+        type=raw,value=${{ github.env.VERSION }}
   add_docker_release_note:
     needs: publish_docker
     name: Add docker release note

From ee45e5890392022471cf6c4a709add0d903bc444 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 11 Apr 2025 17:23:56 +0100
Subject: [PATCH 4/4] Meh

---
 .github/workflows/publish.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index d2b1bb6c..463953fa 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -60,7 +60,8 @@ jobs:
       artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
       docker_tags: |
         type=sha,format=short,event=branch
-        type=raw,value=${{ github.env.VERSION }}
+        type=raw,value=${{ github.event.release.tag_name }}
+      # Like before, using ${{ env.VERSION }} above doesn't work
   add_docker_release_note:
     needs: publish_docker
     name: Add docker release note