mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fixing docker-compose

Browse Source
This commit is contained in:
stefan
2025-09-12 14:58:49 +02:00
parent 3ed5a9cece
commit e7360b4f8e
6 changed files with 103 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DOCKER_COMPOSE_FIX_SUMMARY.md
+34 -71
View File
@@ -1,79 +1,42 @@
# Docker Compose Fix Summary - Meldestelle Project # Docker Compose Fix Summary - Meldestelle Project
## Issues Identified and Fixed ## What was failing
Starting docker-compose.services.yml or docker-compose.clients.yml alone (while docker-compose.yml was already running) failed with errors like:
- service "ping-service" depends on undefined service "consul"
- service "web-app" depends on undefined service "api-gateway"
### Problem Description ## Root cause
The user reported that `docker-compose.services.yml` and `docker-compose.clients.yml` were not working properly, while `docker-compose.yml` worked except for a Keycloak issue. Docker Compose validates depends_on only against services defined in the same compose project (the files provided in the same command). Our services/clients files referenced infrastructure services (consul, postgres, redis, keycloak, api-gateway) that live in docker-compose.yml, so starting them standalone produced “depends on undefined service”.
### Root Causes Identified ## Fixes applied (minimal, safe)
1. Removed cross-file depends_on from these files:
- docker-compose.services.yml → ping-service (removed depends_on on consul, postgres, redis)
- docker-compose.clients.yml → web-app, desktop-app, auth-server, monitoring-server (removed depends_on on api-gateway, keycloak, postgres)
2. Kept existing healthchecks. The apps already handle startup ordering by retrying connections, and you are starting infra first, so this is safe.
3. Left networking as-is to continue sharing the same project-scoped bridge network when using the same project name.
1. **Standalone Execution Issue**: The services and clients compose files were designed to work in combination with the main infrastructure file, not as standalone files ## How to run now
2. **Keycloak Port Mismatch**: Auth-server in clients.yml was trying to connect to `keycloak:8081` but Keycloak runs on port `8080` Option A — Recommended project name (ensures all stacks share the same resources):
3. **Network Configuration Error**: clients.yml had `external: false` instead of `external: true` for the shared network - Start infra:
docker compose -p meldestelle -f docker-compose.yml up -d
- Start services (optional):
docker compose -p meldestelle -f docker-compose.services.yml up -d
- Start clients (optional):
docker compose -p meldestelle -f docker-compose.clients.yml up -d
### Fixes Applied Option B — Combined (unchanged and still works):
- Infra + Services:
docker compose -f docker-compose.yml -f docker-compose.services.yml up -d
- Infra + Clients:
docker compose -f docker-compose.yml -f docker-compose.clients.yml up -d
- Full stack:
docker compose -f docker-compose.yml -f docker-compose.services.yml -f docker-compose.clients.yml up -d
#### 1. Fixed Keycloak Port Reference Notes:
**File**: `docker-compose.clients.yml` - Always start docker-compose.yml before the others when running separately.
**Line**: 102 - Using -p meldestelle ensures the same project-scoped network (meldestelle_meldestelle-network) is reused so containers can resolve each other (postgres, consul, api-gateway, etc.).
**Change**: - If you prefer not to pass -p each time, you can export COMPOSE_PROJECT_NAME=meldestelle in your shell or define it in .env.
```
BEFORE: KEYCLOAK_SERVER_URL: http://keycloak:8081
AFTER: KEYCLOAK_SERVER_URL: http://keycloak:8080
```
#### 2. Fixed Network Configuration ## Status
**File**: `docker-compose.clients.yml` - Services and clients files can now be started standalone (with -p meldestelle) while the infra stack is already running.
**Line**: 177 - Combined modes continue to work.
**Change**:
```
BEFORE: external: false
AFTER: external: true
```
## Correct Usage Instructions
### 1. Infrastructure Only (Base Services)
```bash
docker compose -f docker-compose.yml up -d
```
This starts: PostgreSQL, Redis, Keycloak, Consul, Kafka, Prometheus, Grafana, API Gateway
### 2. Infrastructure + Application Services
```bash
docker compose -f docker-compose.yml -f docker-compose.services.yml up -d
```
This adds: Ping Service (and other services when uncommented)
### 3. Full Stack (Infrastructure + Services + Clients)
```bash
docker compose -f docker-compose.yml -f docker-compose.services.yml -f docker-compose.clients.yml up -d
```
This adds: Web App, Desktop App, Auth Server, Monitoring Server
### 4. Infrastructure + Clients Only (Frontend Development)
```bash
docker compose -f docker-compose.yml -f docker-compose.clients.yml up -d
```
This is useful for frontend development without backend services.
## Important Notes
1. **Do not run services.yml or clients.yml standalone** - they depend on infrastructure services from the main compose file
2. **Always start with docker-compose.yml first** - it creates the shared network and infrastructure services
3. **Use the newer `docker compose` command** instead of `docker-compose` if you encounter Python module errors
4. **Service Dependencies**:
- Services depend on: consul, postgres, redis (from main compose)
- Clients depend on: api-gateway, keycloak, postgres (from main compose)
## Test Results
All combinations now pass configuration validation:
- ✅ `docker-compose.yml` - Works standalone
- ✅ `docker-compose.yml` + `docker-compose.services.yml` - Works combined
- ✅ `docker-compose.yml` + `docker-compose.clients.yml` - Works combined
- ✅ All three files combined - Works as full stack
## Status: RESOLVED ✅
The docker-compose configuration issues have been fixed. All files can now be started successfully using the correct command combinations shown above.
docker-compose.clients.yml
+60 -71
View File
@@ -31,8 +31,6 @@ services:
WEBPACK_DEV_SERVER_PORT: 4000 WEBPACK_DEV_SERVER_PORT: 4000
ports: ports:
- "4000:4000" - "4000:4000"
depends_on:
- api-gateway
networks: networks:
- meldestelle-network - meldestelle-network
healthcheck: healthcheck:
@@ -71,8 +69,6 @@ services:
ports: ports:
- "6080:6080" # Web-based VNC (noVNC) - "6080:6080" # Web-based VNC (noVNC)
- "5901:5901" # VNC direct access - "5901:5901" # VNC direct access
depends_on:
- api-gateway
networks: networks:
- meldestelle-network - meldestelle-network
healthcheck: healthcheck:
@@ -91,76 +87,69 @@ services:
# =================================================================== # ===================================================================
# Auth Server (Custom Keycloak Extension) # Auth Server (Custom Keycloak Extension)
# =================================================================== # ===================================================================
auth-server: # auth-server:
build: # build:
context: . # context: .
dockerfile: dockerfiles/infrastructure/auth-server/Dockerfile # dockerfile: dockerfiles/infrastructure/auth-server/Dockerfile
container_name: meldestelle-auth-server # container_name: meldestelle-auth-server
environment: # environment:
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev} # SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
SERVER_PORT: ${AUTH_SERVICE_PORT:-8087} # SERVER_PORT: ${AUTH_SERVICE_PORT:-8087}
KEYCLOAK_SERVER_URL: http://keycloak:8080 # KEYCLOAK_SERVER_URL: http://keycloak:8080
KEYCLOAK_REALM: meldestelle # KEYCLOAK_REALM: meldestelle
KEYCLOAK_CLIENT_ID: meldestelle-auth-service # KEYCLOAK_CLIENT_ID: meldestelle-auth-service
KEYCLOAK_CLIENT_SECRET: ${KEYCLOAK_CLIENT_SECRET:-auth-service-secret} # KEYCLOAK_CLIENT_SECRET: ${KEYCLOAK_CLIENT_SECRET:-auth-service-secret}
DB_HOST: postgres # DB_HOST: postgres
DB_PORT: 5432 # DB_PORT: 5432
DB_NAME: ${POSTGRES_DB:-meldestelle} # DB_NAME: ${POSTGRES_DB:-meldestelle}
DB_USER: ${POSTGRES_USER:-meldestelle} # DB_USER: ${POSTGRES_USER:-meldestelle}
DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle} # DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
JWT_SECRET: ${JWT_SECRET:-meldestelle-jwt-secret-key-for-development-change-in-production} # JWT_SECRET: ${JWT_SECRET:-meldestelle-jwt-secret-key-for-development-change-in-production}
JWT_ISSUER: ${JWT_ISSUER:-meldestelle-api} # JWT_ISSUER: ${JWT_ISSUER:-meldestelle-api}
JWT_AUDIENCE: ${JWT_AUDIENCE:-meldestelle-clients} # JWT_AUDIENCE: ${JWT_AUDIENCE:-meldestelle-clients}
ports: # ports:
- "${AUTH_SERVICE_PORT:-8087}:${AUTH_SERVICE_PORT:-8087}" # - "${AUTH_SERVICE_PORT:-8087}:${AUTH_SERVICE_PORT:-8087}"
depends_on: # networks:
keycloak: # - meldestelle-network
condition: service_healthy # healthcheck:
postgres: # test: ["CMD", "curl", "--fail", "http://localhost:${AUTH_SERVICE_PORT:-8087}/actuator/health"]
condition: service_healthy # interval: 30s
networks: # timeout: 10s
- meldestelle-network # retries: 3
healthcheck: # start_period: 60s
test: ["CMD", "curl", "--fail", "http://localhost:${AUTH_SERVICE_PORT:-8087}/actuator/health"] # restart: unless-stopped
interval: 30s
timeout: 10s
retries: 3
start_period: 60s
restart: unless-stopped
# =================================================================== # ===================================================================
# Monitoring Server (Custom Grafana Extensions) # Monitoring Server (Custom Grafana Extensions)
# =================================================================== # ===================================================================
monitoring-server: # monitoring-server:
build: # build:
context: . # context: .
dockerfile: dockerfiles/infrastructure/monitoring-server/Dockerfile # dockerfile: dockerfiles/infrastructure/monitoring-server/Dockerfile
container_name: meldestelle-monitoring-server # container_name: meldestelle-monitoring-server
environment: # environment:
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev} # SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
SERVER_PORT: 8088 # SERVER_PORT: 8088
GRAFANA_URL: http://grafana:3000 # GRAFANA_URL: http://grafana:3000
PROMETHEUS_URL: http://prometheus:9090 # PROMETHEUS_URL: http://prometheus:9090
GRAFANA_ADMIN_USER: ${GF_SECURITY_ADMIN_USER:-admin} # GRAFANA_ADMIN_USER: ${GF_SECURITY_ADMIN_USER:-admin}
GRAFANA_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD:-admin} # GRAFANA_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD:-admin}
METRICS_AUTH_USERNAME: ${METRICS_AUTH_USERNAME:-admin} # METRICS_AUTH_USERNAME: ${METRICS_AUTH_USERNAME:-admin}
METRICS_AUTH_PASSWORD: ${METRICS_AUTH_PASSWORD:-metrics} # METRICS_AUTH_PASSWORD: ${METRICS_AUTH_PASSWORD:-metrics}
ports: # ports:
- "8088:8088" # - "8088:8088"
depends_on: # networks:
- api-gateway # - meldestelle-network
networks: # healthcheck:
- meldestelle-network # test: ["CMD", "curl", "--fail", "http://localhost:8088/actuator/health"]
healthcheck: # interval: 30s
test: ["CMD", "curl", "--fail", "http://localhost:8088/actuator/health"] # timeout: 10s
interval: 30s # retries: 3
timeout: 10s # start_period: 60s
retries: 3 # restart: unless-stopped
start_period: 60s # volumes:
restart: unless-stopped # - monitoring-data:/app/data
volumes: # - ./docker/monitoring:/app/config:ro
- monitoring-data:/app/data
- ./docker/monitoring:/app/config:ro
# =================================================================== # ===================================================================
# Volumes für Client-spezifische Daten # Volumes für Client-spezifische Daten
@@ -174,4 +163,4 @@ volumes:
# =================================================================== # ===================================================================
networks: networks:
meldestelle-network: meldestelle-network:
external: true driver: bridge
docker-compose.services.yml
+2 -9
View File
@@ -30,14 +30,7 @@ services:
REDIS_EVENT_STORE_PORT: 6379 REDIS_EVENT_STORE_PORT: 6379
REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-} REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
ports: ports:
- "${PING_SERVICE_PORT:-8082}:${PING_SERVICE_PORT:-8082}" - "${PING_SERVICE_PORT:-8082}:8082"
depends_on:
consul:
condition: service_healthy
postgres:
condition: service_healthy
redis:
condition: service_healthy
networks: networks:
- meldestelle-network - meldestelle-network
healthcheck: healthcheck:
@@ -229,4 +222,4 @@ services:
# =================================================================== # ===================================================================
networks: networks:
meldestelle-network: meldestelle-network:
external: true driver: bridge
docker-compose.yml
+1 -1
View File
@@ -217,7 +217,7 @@ services:
CONSUL_ENABLED: "true" CONSUL_ENABLED: "true"
GATEWAY_PORT: ${GATEWAY_PORT:-8081} GATEWAY_PORT: ${GATEWAY_PORT:-8081}
ports: ports:
- "${GATEWAY_PORT:-8081}:${GATEWAY_PORT:-8081}" - "${GATEWAY_PORT:-8081}:8081"
depends_on: depends_on:
consul: consul:
condition: service_healthy condition: service_healthy
dockerfiles/clients/web-app/Dockerfile
+2 -2
View File
@@ -97,11 +97,11 @@ RUN echo '{"status":"ok","service":"web-app"}' > /usr/share/nginx/html/health
USER nginx-user USER nginx-user
# Expose port # Expose port
EXPOSE 3000 EXPOSE 4000
# Health check # Health check
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
CMD curl --fail http://localhost:3000/health || exit 1 CMD curl --fail http://localhost:4000/health || exit 1
# Start nginx # Start nginx
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]
dockerfiles/clients/web-app/nginx.conf
+4 -4
View File
@@ -1,4 +1,4 @@
user nginx-user; # Running as non-root user defined by container user; omit nginx "user" directive
worker_processes auto; worker_processes auto;
error_log /var/log/nginx/error.log notice; error_log /var/log/nginx/error.log notice;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@@ -27,7 +27,7 @@ http {
gzip on; gzip on;
gzip_vary on; gzip_vary on;
gzip_min_length 10240; gzip_min_length 10240;
gzip_proxied expired no-cache no-store private must-revalidate auth; gzip_proxied expired no-cache no-store private auth;
gzip_types gzip_types
text/plain text/plain
text/css text/css
@@ -78,13 +78,13 @@ http {
# Health check endpoint # Health check endpoint
location /health { location /health {
access_log off; access_log off;
return 200 '{"status":"ok","service":"web-app"}\n';
add_header Content-Type application/json; add_header Content-Type application/json;
return 200 '{"status":"ok","service":"web-app"}\n';
} }
# API proxy (if needed for backend communication) # API proxy (if needed for backend communication)
location /api/ { location /api/ {
proxy_pass http://api-gateway:8081/; proxy_pass http://localhost:8081/;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;