From e76ebb32ab2872893f74247bea5f7377b1793de6 Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Mon, 5 Oct 2026 17:13:10 +0000 Subject: [PATCH] fix(ci): Starter-Defaults patchen auch api/config.yml Namespace --- scripts/ci-starter-defaults.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/ci-starter-defaults.sh b/scripts/ci-starter-defaults.sh index cd402f0..c7bb4af 100755 --- a/scripts/ci-starter-defaults.sh +++ b/scripts/ci-starter-defaults.sh @@ -3,7 +3,7 @@ set -euo pipefail # CI helper: resolve starter placeholders for staging. # Called from .gitea/workflows/deploy.yml (before validate/build). -# Keeps placeholders in git (template), patches .env in CI workspace only. +# Keeps placeholders in git (template), patches CI workspace only (.env + api/config.yml). # # Detection: PROJECT_NAME=__PROJECT_NAME__ or TIBI_NAMESPACE=__TIBI_NAMESPACE__ # Real projects: no-op (already concrete values). @@ -27,7 +27,7 @@ if [ "${is_starter}" != "true" ]; then exit 0 fi -echo "ci-starter-defaults: starter detected, patching .env for CI workspace only." +echo "ci-starter-defaults: starter detected, patching CI workspace only (.env + api/config.yml)." PROJECT_NAME="tibi-svelte-starter" TIBI_NAMESPACE="tibi-svelte-starter" @@ -59,5 +59,17 @@ patch_env "CODING_TIBIADMIN_URL" "${CODING_TIBIADMIN_URL}" patch_env "LIVE_URL" "${LIVE_URL}" patch_env "MOCK" "${MOCK}" +# tibi-server reads the namespace from api/config.yml (not .env) — +# without this the staged api/ still carries __TIBI_NAMESPACE__ and staging reports "project not found". +if [ -f api/config.yml ]; then + sed -i 's#^namespace:.*#namespace: '"${TIBI_NAMESPACE}"'#g' api/config.yml + echo "______ api/config.yml (namespace) ______" + head -3 api/config.yml +fi +# Apache fallback (unused in staging docker setup, kept consistent) +if [ -f frontend/.htaccess ]; then + sed -i 's#__TIBI_NAMESPACE__#'"${TIBI_NAMESPACE}"'#g' frontend/.htaccess || true +fi + echo "______ .env (starter-resolved) ______" cat .env