[fix] forgot APP_PREFIX & APP_SUFFIX in dynamic build args

This commit is contained in:
ElevenNotes
2025-03-08 00:45:28 +01:00
parent 7637bf2c3d
commit 03f63033c5
3 changed files with 13 additions and 7 deletions

View File

@@ -119,6 +119,8 @@ jobs:
docker.cache.name = `${docker.image.name}:${docker.image.prefix}buildcache${docker.image.suffix}`; 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.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 // setup tags
const semver = opt.dot.semver.version.split('.'); const semver = opt.dot.semver.version.split('.');

View File

@@ -1,6 +1,6 @@
ARG APP_VERSION=stable ARG APP_VERSION=stable
ARG APP_VERSION_PREFIX="" ARG APP_PREFIX=""
ARG APP_VERSION_SUFFIX="" ARG APP_SUFFIX=""
# :: Build / styles # :: Build / styles
FROM alpine/git AS styles FROM alpine/git AS styles
@@ -10,7 +10,7 @@ ARG APP_VERSION_SUFFIX=""
cd /git/pykms-frontend; cd /git/pykms-frontend;
# :: Header # :: Header
FROM 11notes/kms:${APP_VERSION_PREFIX}${APP_VERSION}${APP_VERSION_SUFFIX} FROM 11notes/kms:${APP_PREFIX}${APP_VERSION}${APP_SUFFIX}
# :: arguments # :: arguments
ARG TARGETARCH ARG TARGETARCH

View File

@@ -4,21 +4,25 @@ services:
image: "11notes/kms:stable" image: "11notes/kms:stable"
container_name: "kms" container_name: "kms"
environment: environment:
TZ: Europe/Zurich TZ: "Europe/Zurich"
volumes: volumes:
- "var:/kms/var" - "var:/kms/var"
ports: ports:
- "1688:1688/tcp" - "1688:1688/tcp"
restart: always restart: "always"
kms-gui: kms-gui:
image: "11notes/kms-gui:465f4d1" image: "11notes/kms-gui:465f4d1"
depends_on:
kms:
condition: "service_healthy"
restart: true
container_name: "kms-gui" container_name: "kms-gui"
environment: environment:
TZ: Europe/Zurich TZ: "Europe/Zurich"
volumes: volumes:
- "var:/kms/var" - "var:/kms/var"
ports: ports:
- "8080:8080/tcp" - "8080:8080/tcp"
restart: always restart: "always"
volumes: volumes:
var: var: