Stack env Parameter und docker-compose service, inklusive Anordnung d…

…er Services in Reheinfolge der Portnummer vor wls-eai-service
it-at-m · Oct 15, 2024 · 2464018 · 2464018
1 parent 95bee3f
commit 2464018
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 17 deletions.
diff --git a/stack/.env b/stack/.env
@@ -37,4 +37,8 @@ WLS_EAI_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/
 
 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
+WLS_VORFAELLEUNDVORKOMMNISSE_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
+
+WLS_BASISDATEN_SERVICE_PROFILE=local,db-oracle
+WLS_BASISDATEN_SERVICE_DB_URL=jdbc:oracle:thin:@//wls-db-oracle:1521/XEPDB1
+WLS_BASISDATEN_SERVICE_KEYCLOAK_URL=http://kubernetes.docker.internal:8100/auth/realms/${SSO_REALM}/protocol/openid-connect
diff --git a/stack/docker-compose.yml b/stack/docker-compose.yml
@@ -78,40 +78,59 @@ services:
       - services
       - keycloak
 
-  wls-eai-service:
-    container_name: wls-eai-service
-    image: ghcr.io/it-at-m/wahllokalsystem-wls-eai-service:latest
+  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_EAI_SERVICE_PROFILE}
-      - SPRING_DATASOURCE_URL=${WLS_EAI_SERVICE_DB_URL}
-      - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_EAI_SERVICE_KEYCLOAK_URL}/certs
-      - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_EAI_SERVICE_KEYCLOAK_URL}/userinfo
+      - 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:
-      - 8300:8080
+      - 8204:8080
     networks:
       - services
       - keycloak
 
-  wls-vorfaelleundvorkommnisse-service:
-    container_name: wls-vorfaelleundvorkommnisse-service
-    image: ghcr.io/it-at-m/wahllokalsystem-wls-vorfaelleundvorkommnisse-service:latest
+  wls-basisdaten-service:
+    container_name: wls-basisdaten-service
+    image: ghcr.io/it-at-m/wahllokalsystem-wls-basisdaten-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
+      - SPRING_PROFILES_ACTIVE=${WLS_BASISDATEN_SERVICE_PROFILE}
+      - SPRING_DATASOURCE_URL=${WLS_BASISDATEN_SERVICE_DB_URL}
+      - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_BASISDATEN_SERVICE_KEYCLOAK_URL}/certs
+      - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_BASISDATEN_SERVICE_KEYCLOAK_URL}/userinfo
       - SERVER_PORT=8080
     ports:
-      - 8204:8080
+      - 8205:8080
+    networks:
+      - services
+      - keycloak
+
+  wls-eai-service:
+    container_name: wls-eai-service
+    image: ghcr.io/it-at-m/wahllokalsystem-wls-eai-service:latest
+    depends_on:
+      - wls-db-oracle
+    env_file:
+      - .env
+    environment:
+      - SPRING_PROFILES_ACTIVE=${WLS_EAI_SERVICE_PROFILE}
+      - SPRING_DATASOURCE_URL=${WLS_EAI_SERVICE_DB_URL}
+      - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=${WLS_EAI_SERVICE_KEYCLOAK_URL}/certs
+      - SECURITY_OAUTH2_RESOURCE_USER-INFO-URI=${WLS_EAI_SERVICE_KEYCLOAK_URL}/userinfo
+      - SERVER_PORT=8080
+    ports:
+      - 8300:8080
     networks:
       - services
       - keycloak