From ec420e6053f4d11a0af51fe345b00fb326477db0 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 15 Oct 2026 06:00:41 +0000 Subject: [PATCH] fix(ci): expand bot image variables at deploy time --- scripts/deploy.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index a0101a71..a0c27f18 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -70,7 +70,7 @@ cd "$TARGET_DIR" if [ "${SUPPORT_CHAT_KEY+x}" = x ]; then touch .support-chat.env grep -v '^SUPPORT_CHAT_KEY=' .support-chat.env > .support-chat.env.tmp || true - printf "SUPPORT_CHAT_KEY=%s\n" "$SUPPORT_CHAT_KEY" >> .support-chat.env.tmp + printf "SUPPORT_CHAT_KEY=%sn" "$SUPPORT_CHAT_KEY" >> .support-chat.env.tmp mv .support-chat.env.tmp .support-chat.env chmod 600 .support-chat.env fi @@ -93,19 +93,19 @@ echo "Using Nexus npm proxy: $NPM_REGISTRY" NPM_REGISTRY_ARG="--build-arg NPM_REGISTRY=${NPM_REGISTRY}" echo "Building Docker images..." -docker compose --progress plain build \ - --build-arg NEXT_PUBLIC_API_URL="${API_URL}/api" \ - --build-arg VITE_API_URL="${API_URL}" \ +docker compose --progress plain build + --build-arg NEXT_PUBLIC_API_URL="${API_URL}/api" + --build-arg VITE_API_URL="${API_URL}" ${NPM_REGISTRY_ARG} echo "Building support-chat bot image from committed source..." -BOT_IMAGE="canina-support-bot:\${BRANCH}" -docker build --pull=false -f scripts/support-chat/Dockerfile -t "\${BOT_IMAGE}" . +BOT_IMAGE="canina-support-bot:${BRANCH}" +docker build --pull=false -f scripts/support-chat/Dockerfile -t "${BOT_IMAGE}" . BOT_OVERRIDE="/opt/services/ai/canina-bot/support.override.cicd.yml" -cat > "\${BOT_OVERRIDE}" < "${BOT_OVERRIDE}" <