From 662fdffcc52cfc51ac0ec0623639a91a03083643 Mon Sep 17 00:00:00 2001
From: Robbie Blaine <robbieblaine.rb@gmail.com>
Date: Wed, 29 Jan 2025 13:18:19 +0200
Subject: [PATCH] Fix docker tagging

---
 .github/workflows/docker.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d9c2e49..6233a01 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -66,20 +66,16 @@ jobs:
         id: meta
         with:
           images: ghcr.io/${{ github.repository_owner }}/arti
-          flavor: |
-            latest=auto
-            prefix=
-            suffix=
           tags: |
-            # For non-tag events (master branch)
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            # For non-tag events
             type=ref,event=branch
             type=ref,event=pr
-            # For tag events, generate semantic versions
-            type=match,pattern=arti-v?(.*),group=1
-            type=semver,pattern={{version}},value=${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || '' }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || '' }}
-            type=semver,pattern={{major}},value=${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || '' }}
+            # For tag events, use regex to generate versions
+            type=regex,pattern=arti-v(\d+)\.(\d+)\.(\d+),value=$1.$2.$3
+            type=regex,pattern=arti-v(\d+)\.(\d+)\.(\d+),value=$1.$2
+            type=regex,pattern=arti-v(\d+)\.(\d+)\.(\d+),value=$1
+            # Set latest tag for tagged releases
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
       - name: Package and Push
         uses: docker/build-push-action@v6
         with: