Skip to content

Commit 8d5e03c

Browse files
committed
feat: docker profile removed
1 parent 523f6ec commit 8d5e03c

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

docker-compose.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
version: "3.8"
1+
version: "2.1"
22
services:
33
spring-boot-jwt-auth:
44
build: .
55
image: spring-boot-jwt-auth-img
66
ports:
77
- "8080:8080"
88
environment:
9-
- spring.profiles.active=docker
9+
- spring.datasource.url=jdbc:mysql://mysqldb:3306/testdb?useSSL=false
1010
depends_on:
11-
- mysqldb
11+
mysqldb:
12+
condition: service_healthy
1213
restart: on-failure
1314

1415
mysqldb:
1516
image: mysql:5.7
1617
ports:
1718
- "3306:3306"
1819
environment:
19-
- MYSQL_USER=root
20-
- MYSQL_ROOT_PASSWORD=123456
21-
- MYSQL_DATABASE=testdb
20+
MYSQL_USER: "user"
21+
MYSQL_ROOT_PASSWORD: "123456"
22+
MYSQL_DATABASE: "testdb"
2223
restart: unless-stopped
24+
healthcheck:
25+
test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
26+
timeout: 20s
27+
retries: 10
2328
volumes:
2429
- db:/var/lib/mysql
2530

src/main/resources/application-docker.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ server.port=8080
22
spring.application.name=spring-boot-jwt-auth
33

44
spring.datasource.url=jdbc:mysql://localhost:3306/testdb?useSSL=false
5-
spring.datasource.username=root
5+
spring.datasource.username=user
66
spring.datasource.password=123456
77

88
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect

0 commit comments

Comments
 (0)