Skip to content

Commit 35f2c01

Browse files
authored
Merge pull request #104 from LikeLion13th-Hackathon-cesco/develop
๐Ÿ› Fix: ํ˜ธ์ŠคํŠธ ์‹œ๊ฐ„๋Œ€, ์ปจํ…Œ์ด๋„ˆ ์‹œ๊ฐ„๋Œ€ ๋ณผ๋ฅจ ์ €์žฅ, mysql ์„œ์šธ ์‹œ๊ฐ ์žฌ์„ค์ •
2 parents ef8b86d + 0ddb948 commit 35f2c01

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

โ€Ždocker-compose.ymlโ€Ž

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ services:
77
- .env
88
environment:
99
- SPRING_PROFILES_ACTIVE=prod
10+
- TZ=Asia/Seoul
11+
volumes:
12+
- /etc/localtime:/etc/localtime:ro
13+
- /etc/timezone:/etc/timezone:ro
1014
command:
11-
- java -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE} -jar app.jar
15+
- java -Duser.timezone=Asia/Seoul -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE} -jar app.jar
1216
# ์‹คํ–‰ ๋ช…๋ น์–ด: jar ํŒŒ์ผ์„ ์‹คํ–‰ํ•˜๋ฉด์„œ Spring ํ”„๋กœํ•„ ํ™œ์„ฑํ™”
1317
depends_on:
1418
- mysql # ์ด ์„œ๋น„์Šค๊ฐ€ mysql์ด ๋จผ์ € ์‹คํ–‰๋œ ํ›„ ์‹œ์ž‘๋˜๋„๋ก
@@ -25,15 +29,19 @@ services:
2529
- MYSQL_PASSWORD=cesco07
2630
- MYSQL_ROOT_PASSWORD=1234 # ๋ฃจํŠธ ๊ณ„์ •์˜ ๋น„๋ฐ€๋ฒˆํ˜ธ
2731
- TZ=Asia/Seoul
32+
- JAVA_OPTS=-Duser.timezone=Asia/Seoul
2833
command:
2934
- --character-set-server=utf8mb4
3035
- --collation-server=utf8mb4_unicode_ci
3136
- --default-authentication-plugin=mysql_native_password
3237
- --init-connect=SET NAMES utf8mb4
38+
- --default-time-zone=+09:00
3339
volumes:
3440
- mysql-data:/var/lib/mysql
3541
# MySQL์˜ ๋ฐ์ดํ„ฐ ํŒŒ์ผ์„ ํ˜ธ์ŠคํŠธ์— ๋ณผ๋ฅจ์œผ๋กœ ์˜๊ตฌ ์ €์žฅ
3642
# ์ปจํ…Œ์ด๋„ˆ๊ฐ€ ์‚ญ์ œ๋ผ๋„ DB ๋‚ด์šฉ์€ ์œ ์ง€๋จ
43+
- /etc/localtime:/etc/localtime:ro #
44+
- /etc/timezone:/etc/timezone:ro
3745
networks:
3846
- cesco-network # Spring๊ณผ ๊ฐ™์€ ๋„คํŠธ์›Œํฌ ์ƒ์— ์žˆ์–ด์„œ mysql์ด๋ผ๋Š” ํ˜ธ์ŠคํŠธ ์ด๋ฆ„์œผ๋กœ ์ ‘๊ทผ ๊ฐ€๋Šฅ
3947

0 commit comments

Comments
ย (0)