From bfdd8c041c4140fbd660e8e39d22a179c9faecda Mon Sep 17 00:00:00 2001
From: Ludovic Muller <ludovicmuller1@gmail.com>
Date: Tue, 5 Dec 2023 09:22:39 +0100
Subject: [PATCH 1/2] ci: use docker/metadata-action

---
 .github/workflows/docker.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index b0c49d76..a42354c0 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -33,11 +33,19 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
-        uses: zazuko/action-docker-meta@main
         id: docker_meta
+        uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/zazuko/trifid,zazuko/trifid
-          strip-tag-prefix: "trifid@"
+          images: |
+            ghcr.io/zazuko/trifid
+            zazuko/trifid
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=semver,prefix=trifid@,pattern={{version}}
+            type=semver,prefix=trifid@,pattern={{major}}.{{minor}}
+            type=semver,prefix=trifid@,pattern={{major}}
+            type=sha
 
       - name: Build and push Docker images
         id: docker_build

From b8a1cbb832d6d062bae7c2c396427e8ba00e0b50 Mon Sep 17 00:00:00 2001
From: Ludovic Muller <ludovicmuller1@gmail.com>
Date: Tue, 5 Dec 2023 09:26:09 +0100
Subject: [PATCH 2/2] ci: also build Docker image for main branch

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

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index a42354c0..3c72c4db 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -2,6 +2,8 @@ name: Build and push Docker image
 
 on:
   push:
+    branches:
+      - main
     tags:
       - "trifid@*.*.*"