diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 33c51bb..b10b6bb 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -106,7 +106,7 @@ jobs: docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d echo "โณ Waiting for health check..." - sleep 15 + sleep 10 echo "๐Ÿฅ Checking application health..." for i in {1..30}; do @@ -115,10 +115,17 @@ jobs: docker image prune -f exit 0 fi + + # 5์ดˆ๋งˆ๋‹ค ๋กœ๊ทธ ํ™•์ธ + if [ $((i % 5)) -eq 0 ]; then + echo "๐Ÿ“‹ Recent logs (attempt $i/30):" + docker compose -f docker-compose.yml -f docker-compose.dev.yml logs --tail=20 widyu-api + fi + echo "Waiting for application to be ready... ($i/30)" sleep 2 done - echo "โš ๏ธ Health check timeout. Checking logs..." - docker compose -f docker-compose.yml -f docker-compose.dev.yml logs --tail=50 widyu-api + echo "โš ๏ธ Health check timeout. Full logs:" + docker compose -f docker-compose.yml -f docker-compose.dev.yml logs --tail=100 widyu-api exit 1 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index d1d5e53..c8254c0 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,8 +1,9 @@ # Development environment override # ์‚ฌ์šฉ๋ฒ•: docker compose -f docker-compose.yml -f docker-compose.dev.yml up +# ๊ฐœ๋ฐœ ํ™˜๊ฒฝ์€ ๋‚ด๋ถ€ MySQL ์ปจํ…Œ์ด๋„ˆ ์‚ฌ์šฉ services: - # MySQL Database (๋กœ์ปฌ/๊ฐœ๋ฐœ ์ „์šฉ) + # MySQL Database (๊ฐœ๋ฐœ ์ „์šฉ) mysql: image: mysql:8.0 container_name: widyu-mysql-dev diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e2679e2..d939e02 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -12,7 +12,7 @@ services: # Database (RDS) MYSQL_HOST: ${RDS_ENDPOINT} - MYSQL_PORT: ${RDS_PORT:-3306} + MYSQL_PORT: ${RDS_PORT} MYSQL_USERNAME: ${RDS_USERNAME} MYSQL_PASSWORD: ${RDS_PASSWORD} @@ -58,7 +58,7 @@ services: --save 300 10 --save 60 10000 ports: - - "127.0.0.1:${REDIS_PORT:-6379}:6379" # ๋‚ด๋ถ€ ์ ‘๊ทผ๋งŒ + - "127.0.0.1:${REDIS_PORT}:6379" # ๋‚ด๋ถ€ ์ ‘๊ทผ๋งŒ healthcheck: test: ["CMD", "redis-cli", "--no-auth-warning", "-a", "${REDIS_PASSWORD}", "ping"] logging: