fix: use correct compose service names in health checks
All checks were successful
CI / build (push) Successful in 1m19s
CI / docker (push) Successful in 33s

The verify_health functions passed short service names (postgres,
clickhouse, server, logto) but the actual compose services are
prefixed with cameleer-. This caused docker compose ps -q to return
empty, so health was never read and checks always timed out.

Also renamed server/server-ui service definitions to
cameleer-server/cameleer-server-ui for consistency.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-14 19:17:41 +02:00
parent 27c3f4d136
commit 4a67677158
2 changed files with 1361 additions and 1192 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1027,7 +1027,7 @@ COMPOSEEOF
cat >> "$f" << COMPOSEEOF cat >> "$f" << COMPOSEEOF
server: cameleer-server:
image: \${SERVER_IMAGE:-gitea.siegeln.net/cameleer/cameleer3-server}:\${VERSION:-latest} image: \${SERVER_IMAGE:-gitea.siegeln.net/cameleer/cameleer3-server}:\${VERSION:-latest}
container_name: cameleer-server container_name: cameleer-server
restart: unless-stopped restart: unless-stopped
@@ -1078,11 +1078,11 @@ COMPOSEEOF
- cameleer-traefik - cameleer-traefik
- cameleer-apps - cameleer-apps
server-ui: cameleer-server-ui:
image: \${SERVER_UI_IMAGE:-gitea.siegeln.net/cameleer/cameleer3-server-ui}:\${VERSION:-latest} image: \${SERVER_UI_IMAGE:-gitea.siegeln.net/cameleer/cameleer3-server-ui}:\${VERSION:-latest}
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
server: cameleer-server:
condition: service_healthy condition: service_healthy
environment: environment:
CAMELEER_API_URL: http://cameleer-server:8081 CAMELEER_API_URL: http://cameleer-server:8081
@@ -1214,20 +1214,20 @@ verify_health() {
log_info "Verifying installation..." log_info "Verifying installation..."
local failed=0 local failed=0
wait_for_docker_healthy "PostgreSQL" "postgres" 120 || failed=1 wait_for_docker_healthy "PostgreSQL" "cameleer-postgres" 120 || failed=1
[ $failed -eq 0 ] && \ [ $failed -eq 0 ] && \
wait_for_docker_healthy "ClickHouse" "clickhouse" 120 || failed=1 wait_for_docker_healthy "ClickHouse" "cameleer-clickhouse" 120 || failed=1
if [ "$DEPLOYMENT_MODE" = "standalone" ]; then if [ "$DEPLOYMENT_MODE" = "standalone" ]; then
[ $failed -eq 0 ] && \ [ $failed -eq 0 ] && \
wait_for_docker_healthy "Cameleer Server" "server" 300 || failed=1 wait_for_docker_healthy "Cameleer Server" "cameleer-server" 300 || failed=1
[ $failed -eq 0 ] && \ [ $failed -eq 0 ] && \
check_endpoint "Server UI" "https://localhost:${HTTPS_PORT}/" 60 || failed=1 check_endpoint "Server UI" "https://localhost:${HTTPS_PORT}/" 60 || failed=1
else else
[ $failed -eq 0 ] && \ [ $failed -eq 0 ] && \
wait_for_docker_healthy "Logto + Bootstrap" "logto" 300 || failed=1 wait_for_docker_healthy "Logto + Bootstrap" "cameleer-logto" 300 || failed=1
[ $failed -eq 0 ] && \ [ $failed -eq 0 ] && \
check_endpoint "Cameleer SaaS" "https://localhost:${HTTPS_PORT}/platform/api/config" 120 || failed=1 check_endpoint "Cameleer SaaS" "https://localhost:${HTTPS_PORT}/platform/api/config" 120 || failed=1