This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit cf3fd3b4 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Merge branch '499-confidential-issue' into 'development'

Now with strong passwords.

See merge request !250
parents ae53fdd5 b48c33dd
2 merge requests!251Development,!250Now with strong passwords.
...@@ -32,6 +32,7 @@ services: ...@@ -32,6 +32,7 @@ services:
- OIDC_KEYCLOAK_CLIENTID=${OIDC_KEYCLOAK_CLIENTID} - OIDC_KEYCLOAK_CLIENTID=${OIDC_KEYCLOAK_CLIENTID}
- MAIL_USERNAME=${MAIL_USERNAME} - MAIL_USERNAME=${MAIL_USERNAME}
- MAIL_PASSWORD=${MAIL_PASSWORD} - MAIL_PASSWORD=${MAIL_PASSWORD}
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
#KEYCLOAK #KEYCLOAK
# - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster # - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
# - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app # - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
...@@ -59,7 +60,7 @@ services: ...@@ -59,7 +60,7 @@ services:
max-size: 50m max-size: 50m
environment: environment:
- MYSQL_USER=root - MYSQL_USER=root
- MYSQL_ALLOW_EMPTY_PASSWORD=yes - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
- MYSQL_DATABASE=gitsearch - MYSQL_DATABASE=gitsearch
command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
restart: always restart: always
......
...@@ -33,9 +33,9 @@ spring: ...@@ -33,9 +33,9 @@ spring:
enabled: false enabled: false
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
url: jdbc:mysql://sharing_mysql:3306/gitsearch?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true url: jdbc:mysql://sharing_mysql:3306/gitsearch?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
username: root username: root
password: password: ${MYSQL_PASSWORD}
hikari: hikari:
poolName: Hikari poolName: Hikari
auto-commit: false auto-commit: false
......
...@@ -45,9 +45,9 @@ spring: ...@@ -45,9 +45,9 @@ spring:
indent-output: true indent-output: true
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
url: jdbc:mysql://sharing_mysql:3306/gitsearch?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true url: jdbc:mysql://sharing_mysql:3306/gitsearch?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
username: root username: root
password: password: ${MYSQL_PASSWORD}
hikari: hikari:
poolName: Hikari poolName: Hikari
auto-commit: false auto-commit: false
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment