Skip to content
Snippets Groups Projects
Commit 5d1c786b authored by OZGCloud's avatar OZGCloud
Browse files

Merge remote-tracking branch 'origin/master' into OZG-4321-Login

parents 4038fda6 d8da38ac
Branches
Tags
No related merge requests found
......@@ -28,8 +28,8 @@
root = true
[*]
indent_style = tab
indent_size = 4
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
......
......@@ -2,7 +2,7 @@
"baseUrl": "http://localhost:4300",
"env": {
"dbUrl": "mongodb://localhost:27018",
"database": "test",
"database": "local",
"keycloakRealm": "by-e2e-local-dev",
"keycloakUrl": "https://sso.dev.by.ozg-cloud.de/",
"keycloakClient": "alfa",
......
......@@ -45,6 +45,7 @@ services:
- OZGCLOUD_PROCESSORS_0_NAME=ticketCheck
- OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
- SPRING_DATA_MONGODB_HOST=mongodb
- SPRING_DATA_MONGODB_DATABASE=local
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-local,e2e}
- LOGGING_CONFIG=classpath:log4j2-local.xml
ports:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment