diff --git a/docker-compose.yml b/docker-compose.yml index fbb520c..7e2b446 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,8 @@ services: image: mysql:8.0 container_name: my-mysql restart: always + env_file: + - ~/docker-env.env environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} MYSQL_DATABASE: mydb diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4d5adc9..08ca6d4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://db:3306/mydb - username: root - password: 53099035 + url: ${SPRING_DATASOURCE_URL} + username: ${MYSQL_USER} + password: ${MYSQL_PASSWORD} jpa: hibernate: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 139dfa4..e00ea3b 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://db:3306/mydb - username: root - password: 53099035 + url: ${db.url} + username: ${db.username} + password: ${db.password} sql: init: mode: never