diff --git a/stack/.env b/stack/.env index c5d465d8c..6a0cf81cc 100644 --- a/stack/.env +++ b/stack/.env @@ -45,4 +45,8 @@ WLS_BASISDATEN_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/ WLS_MONITORING_SERVICE_PROFILE=local,db-oracle WLS_MONITORING_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1 -WLS_MONITORING_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect \ No newline at end of file +WLS_MONITORING_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect + +WLS_WAHLVORSTAND_SERVICE_PROFILE=local,db-oracle +WLS_WAHLVORSTAND_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1 +WLS_WAHLVORSTAND_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 a5e671650..abdf37b3e 100644 --- a/stack/docker-compose.yml +++ b/stack/docker-compose.yml @@ -135,6 +135,25 @@ services: - services - keycloak + wls-wahlvorstand-service: + container_name: wls-wahlvorstand-service + image: ghcr.io/it-at-m/wahllokalsystem-wls-wahlvorstand-service:latest + depends_on: + - wls-db-oracle + env_file: + - .env + environment: + - SPRING_PROFILES_ACTIVE=${WLS_WAHLVORSTAND_SERVICE_PROFILE} + - SPRING_DATASOURCE_URL=${WLS_WAHLVORSTAND_SERVICE_DB_URL} + - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_WAHLVORSTAND_SERVICE_KEYCLOAK_URL}/certs + - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_WAHLVORSTAND_SERVICE_KEYCLOAK_URL}/userinfo + - SERVER_PORT=8080 + ports: + - 8207:8080 + networks: + - services + - keycloak + wls-eai-service: container_name: wls-eai-service image: ghcr.io/it-at-m/wahllokalsystem-wls-eai-service:latest diff --git a/wls-wahlvorstand-service/pom.xml b/wls-wahlvorstand-service/pom.xml index fce25f595..36d8c105b 100644 --- a/wls-wahlvorstand-service/pom.xml +++ b/wls-wahlvorstand-service/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 de.muenchen.oss.wahllokalsystem wls-wahlvorstand-service - 0.0.1-SNAPSHOT + 0.2.0-SNAPSHOT wls_wahlvorstand_service @@ -556,8 +554,8 @@ itm-java-codeformat/java_codestyle_formatter.xml - - + + diff --git a/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json b/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json index d61747485..fe3b55f29 100644 --- a/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json +++ b/wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json @@ -2,7 +2,7 @@ "docker": { "token_type": "", "auth_token": "", - "WLS_WAHLVORSTAND_SERVICE_URL": "http://localhost:8201", + "WLS_WAHLVORSTAND_SERVICE_URL": "http://localhost:8207", "SSO_URL": "http://kubernetes.docker.internal:8100" }, "nonDocker": {