From 03f63033c5434c0b18c9b8e6876077471efe35ff Mon Sep 17 00:00:00 2001
From: ElevenNotes <github@11notes.ch>
Date: Sat, 8 Mar 2025 00:45:28 +0100
Subject: [PATCH] [fix] forgot APP_PREFIX & APP_SUFFIX in dynamic build args

---
 .github/workflows/docker.yml |  2 ++
 arch.dockerfile              |  6 +++---
 compose.yaml                 | 12 ++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fa6e77a..fbc41c9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -119,6 +119,8 @@ jobs:
 
             docker.cache.name = `${docker.image.name}:${docker.image.prefix}buildcache${docker.image.suffix}`;
             docker.cache.grype = `${docker.cache.registry}${docker.image.name}:${docker.image.prefix}grype${docker.image.suffix}`;
+            docker.app.prefix = docker.image.prefix;
+            docker.app.suffix = docker.image.suffix;
 
             // setup tags
               const semver = opt.dot.semver.version.split('.');
diff --git a/arch.dockerfile b/arch.dockerfile
index ecddf3c..f8b51e2 100644
--- a/arch.dockerfile
+++ b/arch.dockerfile
@@ -1,6 +1,6 @@
 ARG APP_VERSION=stable
-ARG APP_VERSION_PREFIX=""
-ARG APP_VERSION_SUFFIX=""
+ARG APP_PREFIX=""
+ARG APP_SUFFIX=""
 
 # :: Build / styles
   FROM alpine/git AS styles
@@ -10,7 +10,7 @@ ARG APP_VERSION_SUFFIX=""
     cd /git/pykms-frontend;
 
 # :: Header
-  FROM 11notes/kms:${APP_VERSION_PREFIX}${APP_VERSION}${APP_VERSION_SUFFIX}
+  FROM 11notes/kms:${APP_PREFIX}${APP_VERSION}${APP_SUFFIX}
 
   # :: arguments
     ARG TARGETARCH
diff --git a/compose.yaml b/compose.yaml
index 10caad6..e2a7b38 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -4,21 +4,25 @@ services:
     image: "11notes/kms:stable"
     container_name: "kms"
     environment:
-      TZ: Europe/Zurich
+      TZ: "Europe/Zurich"
     volumes:
       - "var:/kms/var"
     ports:
       - "1688:1688/tcp"
-    restart: always
+    restart: "always"
   kms-gui:
     image: "11notes/kms-gui:465f4d1"
+    depends_on:
+      kms:
+        condition: "service_healthy"
+        restart: true
     container_name: "kms-gui"
     environment:
-      TZ: Europe/Zurich
+      TZ: "Europe/Zurich"
     volumes:
       - "var:/kms/var"
     ports:
       - "8080:8080/tcp"
-    restart: always
+    restart: "always"
 volumes:
   var:
\ No newline at end of file