From e0cce2a0060f844a69f431213db9643398e41c40 Mon Sep 17 00:00:00 2001 From: vjohnslhm <145964798+vjohnslhm@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:04:50 +0200 Subject: [PATCH] #124 service ist jetzt teil von docker compose --- stack/.env | 6 +++++- stack/docker-compose.yml | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/stack/.env b/stack/.env index 6cf7775ad..151802fb9 100644 --- a/stack/.env +++ b/stack/.env @@ -33,4 +33,8 @@ WLS_WAHLVORBEREITUNG_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100 WLS_EAI_SERVICE_PROFILE=local,db-oracle,db-dummydata WLS_EAI_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1 -WLS_EAI_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect \ No newline at end of file +WLS_EAI_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect + +WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_PROFILE=local,db-oracle,dummy.nobezirkid.check +WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1 +WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect \ No newline at end of file diff --git a/stack/docker-compose.yml b/stack/docker-compose.yml index c54e79188..ca07c8d6c 100644 --- a/stack/docker-compose.yml +++ b/stack/docker-compose.yml @@ -97,6 +97,25 @@ services: - services - keycloak + wls-vorfaelleundvorkommnisse-service: + container_name: wls-vorfaelleundvorkommnisse-service + image: ghcr.io/it-at-m/wahllokalsystem-wls-vorfaelleundvorkommnisse-service:latest + depends_on: + - wls-db-oracle + env_file: + - .env + environment: + - SPRING_PROFILES_ACTIVE=${WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_PROFILE} + - SPRING_DATASOURCE_URL=${WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_DB_URL} + - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_KEYCLOAK_URL}/certs + - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_KEYCLOAK_URL}/userinfo + - SERVER_PORT=8080 + ports: + - 8100:8080 + networks: + - services + - keycloak + ## Keycloak wls-keycloak: container_name: wls-keycloak