Merge pull request #18
* MP-19 Refactoring: Einführung der "Registry" & "Masterdata" Trennung … * MP-19 Refactoring: Frontend Tabula Rasa * MP-19 Refactoring: Frontend Tabula Rasa * refactoring: * MP-20 fix(docker/clients): include `:domains` module in web/desktop b… * MP-20 fix(web-app build): resolve JS compile error and add dev/prod b… * MP-20 fix(web-app): remove vendor.js reference and harden JS bootstra… * MP-20 fixing: clients * MP-20 fixing: clients
This commit is contained in:
+52
-8
@@ -29,7 +29,7 @@ services:
|
||||
- postgres
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
image: redis:8.4-alpine
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-redis
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
@@ -105,7 +105,7 @@ services:
|
||||
- pgadmin
|
||||
|
||||
prometheus:
|
||||
image: prom/prometheus:v2.54.1
|
||||
image: prom/prometheus:v3.7.3
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-prometheus
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
@@ -128,7 +128,7 @@ services:
|
||||
- prometheus
|
||||
|
||||
grafana:
|
||||
image: grafana/grafana:11.3.0
|
||||
image: grafana/grafana:12.3
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-grafana
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
@@ -157,7 +157,7 @@ services:
|
||||
# ==========================================
|
||||
|
||||
consul:
|
||||
image: hashicorp/consul:1.15
|
||||
image: hashicorp/consul:1.22.1
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-consul
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
@@ -182,7 +182,7 @@ services:
|
||||
GRADLE_VERSION: 9.1.0
|
||||
JAVA_VERSION: 21
|
||||
VERSION: 1.0.0
|
||||
BUILD_DATE: "2025-11-25"
|
||||
BUILD_DATE: "2025-11-29"
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-gateway
|
||||
restart: no
|
||||
ports:
|
||||
@@ -230,7 +230,7 @@ services:
|
||||
GRADLE_VERSION: 9.1.0
|
||||
JAVA_VERSION: 21
|
||||
VERSION: 1.0.0
|
||||
BUILD_DATE: "2025-11-21"
|
||||
BUILD_DATE: "2025-11-29"
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-ping-service
|
||||
restart: no # "${RESTART_POLICY:-unless-stopped}"
|
||||
ports:
|
||||
@@ -246,7 +246,7 @@ services:
|
||||
SPRING_CLOUD_CONSUL_PORT: 8500
|
||||
SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME: ping-service
|
||||
|
||||
# --- DATENBANK VERBINDUNG (Das hat gefehlt!) ---
|
||||
# --- DATENBANK VERBINDUNG ---
|
||||
# Wir nutzen die Container-Namen aus deiner .env Variable
|
||||
SPRING_DATASOURCE_URL: jdbc:postgresql://${COMPOSE_PROJECT_NAME}-postgres:5432/${POSTGRES_DB}
|
||||
SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER}
|
||||
@@ -254,7 +254,7 @@ services:
|
||||
# WICHTIG: Wir wollen nur validieren, nichts erstellen.
|
||||
SPRING_JPA_HIBERNATE_DDL_AUTO: validate
|
||||
|
||||
# --- REDIS (DAS HAT GEFEHLT!) ---
|
||||
# --- REDIS ---
|
||||
# Wir nutzen den Service-Namen, genau wie bei Postgres
|
||||
SPRING_DATA_REDIS_HOST: ${COMPOSE_PROJECT_NAME}-redis
|
||||
SPRING_DATA_REDIS_PORT: 6379
|
||||
@@ -270,6 +270,50 @@ services:
|
||||
aliases:
|
||||
- ping-service
|
||||
|
||||
# ==========================================
|
||||
# CLIENT APPLICATIONS
|
||||
# ==========================================
|
||||
web-app:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: dockerfiles/clients/web-app/Dockerfile
|
||||
args:
|
||||
GRADLE_VERSION: ${DOCKER_GRADLE_VERSION:-9.1.0}
|
||||
JAVA_VERSION: ${DOCKER_JAVA_VERSION:-21}
|
||||
NODE_VERSION: ${DOCKER_NODE_VERSION:-22.21.0}
|
||||
NGINX_IMAGE_TAG: ${DOCKER_NGINX_VERSION:-1.28.0-alpine}
|
||||
WEB_BUILD_PROFILE: ${WEB_BUILD_PROFILE:-dev}
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-web-app
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "${WEB_APP_PORT}"
|
||||
depends_on:
|
||||
api-gateway:
|
||||
condition: service_started
|
||||
networks:
|
||||
meldestelle-network:
|
||||
aliases:
|
||||
- web-app
|
||||
|
||||
desktop-app:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: dockerfiles/clients/desktop-app/Dockerfile
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-desktop-app
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
API_BASE_URL: http://api-gateway:8081
|
||||
ports:
|
||||
- "${DESKTOP_APP_VNC_PORT}"
|
||||
- "${DESKTOP_APP_NOVNC_PORT}"
|
||||
depends_on:
|
||||
api-gateway:
|
||||
condition: service_started
|
||||
networks:
|
||||
meldestelle-network:
|
||||
aliases:
|
||||
- desktop-app
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
pgadmin-data:
|
||||
|
||||
Reference in New Issue
Block a user