From c069b5e3bdad77d31dafae2f942ee4240910df9f Mon Sep 17 00:00:00 2001
From: jamesread <contact@jread.com>
Date: Mon, 6 Jan 2025 15:49:26 +0000
Subject: [PATCH 1/2] bugfix: #517 - Switch to semver (tags) for container
 versions

---
 .github/workflows/build-containers.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index a0d83a75..1fde4808 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -16,11 +16,11 @@ jobs:
       - name: Get Container Version
         id: getcontainerver
         run: |
-          echo "containerver=$(date +'%s')" >> "$GITHUB_OUTPUT"
+          echo "containerver=${{ github.ref_name }}" >> "$GITHUB_OUTPUT"
 
   build-containers:
     needs: build-containers-common
-    strategy: 
+    strategy:
       matrix:
         include:
           - runnertags: ubuntu-latest
@@ -50,14 +50,14 @@ jobs:
           docker images
 
       - name: docker tag
-        env: 
+        env:
           CONTAINERVER: ${{ needs.build-containers-common.outputs.containerver }}
         run: |
-          docker tag localhost/postiz ghcr.io/gitroomhq/postiz-app:${{ matrix.arch }}-${{ env.CONTAINERVER }}
-          docker push ghcr.io/gitroomhq/postiz-app:${{ matrix.arch }}-${{ env.CONTAINERVER }}
+          docker tag localhost/postiz ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-${{ matrix.arch }}
+          docker push ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-${{ matrix.arch }}
 
-          docker tag localhost/postiz-devcontainer ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}
-          docker push ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}
+          docker tag localhost/postiz-devcontainer ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}-${{ matrix.arch }}
+          docker push ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}-${{ matrix.arch }}
 
           docker tag ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }} ghcr.io/gitroomhq/postiz-devcontainer:latest
           docker push ghcr.io/gitroomhq/postiz-devcontainer:latest
@@ -73,13 +73,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Create Docker Manifest 
-        env: 
+      - name: Create Docker Manifest
+        env:
           CONTAINERVER: ${{ needs.build-containers-common.outputs.containerver }}
         run: |
           docker manifest create \
             ghcr.io/gitroomhq/postiz-app:latest \
-            ghcr.io/gitroomhq/postiz-app:amd64-${{ env.CONTAINERVER }} \
-            ghcr.io/gitroomhq/postiz-app:arm64-${{ env.CONTAINERVER }}
+            ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-arm64 \
+            ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-amd64
 
           docker manifest push ghcr.io/gitroomhq/postiz-app:latest

From c3879a784f2b481a2353ef420035821c17e43981 Mon Sep 17 00:00:00 2001
From: jamesread <contact@jread.com>
Date: Mon, 6 Jan 2025 15:54:29 +0000
Subject: [PATCH 2/2] bugfix: Issue with devcontainer naming inconsistency with
 new semver containers

---
 .github/workflows/build-containers.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 1fde4808..861b88f3 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -59,9 +59,6 @@ jobs:
           docker tag localhost/postiz-devcontainer ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}-${{ matrix.arch }}
           docker push ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}-${{ matrix.arch }}
 
-          docker tag ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }} ghcr.io/gitroomhq/postiz-devcontainer:latest
-          docker push ghcr.io/gitroomhq/postiz-devcontainer:latest
-
   build-container-manifest:
     needs: [build-containers, build-containers-common]
     runs-on: ubuntu-latest
@@ -83,3 +80,10 @@ jobs:
             ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-amd64
 
           docker manifest push ghcr.io/gitroomhq/postiz-app:latest
+
+          docker manifest create \
+            ghcr.io/gitroomhq/postiz-devcontainer:latest \
+            ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}-arm64 \
+            ghcr.io/gitroomhq/postiz-devcontainer:${{ env.CONTAINERVER }}-amd64
+
+          docker manifest push ghcr.io/gitroomhq/postiz-devcontainer:latest