Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

115 abschluss für betrieb von wls service wahlvorstand #632

Merged
merged 3 commits into from
Dec 11, 2024
Merged

115 abschluss für betrieb von wls service wahlvorstand #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
162d87d
Service ist Teil von Docker-Compose und Port für http-client korrigie…
Nic12345678 Dec 10, 2024
2316faa
[maven-release-plugin] prepare release wls-wahlvorstand-service/0.1.0
github-actions[bot] Dec 10, 2024
19b5b2c
[maven-release-plugin] prepare for next development iteration
github-actions[bot] Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion stack/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
19 changes: 19 additions & 0 deletions stack/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions wls-wahlvorstand-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>de.muenchen.oss.wahllokalsystem</groupId>
<artifactId>wls-wahlvorstand-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<name>wls_wahlvorstand_service</name>

<properties>
Expand Down Expand Up @@ -556,8 +554,8 @@
<eclipse>
<file>itm-java-codeformat/java_codestyle_formatter.xml</file>
</eclipse>
<trimTrailingWhitespace/>
<endWithNewline/>
<trimTrailingWhitespace />
<endWithNewline />
</java>
</configuration>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion wls-wahlvorstand-service/src/test/resources/http.request/http-client.env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading