fix: use correct compose service names in health checks
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:
File diff suppressed because it is too large
Load Diff
@@ -1027,7 +1027,7 @@ COMPOSEEOF
|
||||
|
||||
cat >> "$f" << COMPOSEEOF
|
||||
|
||||
server:
|
||||
cameleer-server:
|
||||
image: \${SERVER_IMAGE:-gitea.siegeln.net/cameleer/cameleer3-server}:\${VERSION:-latest}
|
||||
container_name: cameleer-server
|
||||
restart: unless-stopped
|
||||
@@ -1078,11 +1078,11 @@ COMPOSEEOF
|
||||
- cameleer-traefik
|
||||
- cameleer-apps
|
||||
|
||||
server-ui:
|
||||
cameleer-server-ui:
|
||||
image: \${SERVER_UI_IMAGE:-gitea.siegeln.net/cameleer/cameleer3-server-ui}:\${VERSION:-latest}
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
server:
|
||||
cameleer-server:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
CAMELEER_API_URL: http://cameleer-server:8081
|
||||
@@ -1214,20 +1214,20 @@ verify_health() {
|
||||
log_info "Verifying installation..."
|
||||
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 ] && \
|
||||
wait_for_docker_healthy "ClickHouse" "clickhouse" 120 || failed=1
|
||||
wait_for_docker_healthy "ClickHouse" "cameleer-clickhouse" 120 || failed=1
|
||||
|
||||
if [ "$DEPLOYMENT_MODE" = "standalone" ]; then
|
||||
[ $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 ] && \
|
||||
check_endpoint "Server UI" "https://localhost:${HTTPS_PORT}/" 60 || failed=1
|
||||
else
|
||||
[ $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 ] && \
|
||||
check_endpoint "Cameleer SaaS" "https://localhost:${HTTPS_PORT}/platform/api/config" 120 || failed=1
|
||||
|
||||
Reference in New Issue
Block a user