Skip to content

Commit

Permalink
Make MySQL configuration files/docs consistent
Browse files Browse the repository at this point in the history
- use petclinic as the db name and root password

Fixes spring-projects#322
  • Loading branch information
trisberg authored and dsyer committed May 14, 2018
1 parent dd5b080 commit 6905e38
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
mysql:
image: mysql
image: mysql:5.7
ports:
- "3306:3306"
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=test
- MYSQL_ROOT_PASSWORD=petclinic
- MYSQL_DATABASE=petclinic
volumes:
- "./conf.d:/etc/mysql/conf.d:ro"
- "./conf.d:/etc/mysql/conf.d:ro"
4 changes: 2 additions & 2 deletions src/main/resources/application-mysql.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# database init, supports mysql too
database=mysql
spring.datasource.url=jdbc:mysql://localhost/test
spring.datasource.url=jdbc:mysql://localhost/petclinic
spring.datasource.username=root
spring.datasource.password=root
spring.datasource.password=petclinic
# Uncomment this the first time the app runs
# spring.datasource.initialization-mode=always

0 comments on commit 6905e38

Please sign in to comment.