diff --git a/docker-compose.yml b/docker-compose.yml index bd62332..e95bf98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,8 @@ -version: '3.8' - services: db: image: mysql:8.0 container_name: my-mysql - restart: unless-stopped + restart: always env_file: - /home/ubuntu/docker-env.env environment: @@ -15,6 +13,12 @@ services: - "3306:3306" volumes: - db_data:/var/lib/mysql + healthcheck: + test: ["CMD", "mysqladmin", "ping", "--silent"] + interval: 30s + retries: 5 + start_period: 5s + timeout: 10s app: image: ggamnunq/umc:backend @@ -23,11 +27,17 @@ services: depends_on: - db environment: - SPRING_DATASOURCE_URL: jdbc:mysql://my-mysql:3306/mydb + SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/mydb SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} ports: - "8080:8080" + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"] + interval: 30s + retries: 5 + start_period: 10s + timeout: 10s nginx: image: ggamnunq/umc:nginx diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8fa438c..ea995e5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,7 +7,7 @@ spring: jpa: hibernate: - ddl-auto: update + ddl-auto: none web: cors: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index e00ea3b..92dc84a 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -10,7 +10,7 @@ spring: jpa: properties: hibernate: - dialect: org.hibernate.dialect.MySQLDialect + dialect: org.hibernate.dialect.MySQL8Dialect show_sql: true format_sql: true use_sql_comments: true