diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 53e6b8b..d1d5e53 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -8,13 +8,13 @@ services: container_name: widyu-mysql-dev restart: unless-stopped environment: - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword} - MYSQL_DATABASE: ${DB_NAME:-widyu_dev} - MYSQL_USER: ${MYSQL_USERNAME:-widyu_user} - MYSQL_PASSWORD: ${MYSQL_PASSWORD:-widyu_password} + MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} + MYSQL_DATABASE: ${DB_NAME} + MYSQL_USER: ${MYSQL_USERNAME} + MYSQL_PASSWORD: ${MYSQL_PASSWORD} TZ: Asia/Seoul ports: - - "${HOST_MYSQL_PORT:-3307}:3306" + - "${HOST_MYSQL_PORT}:3306" volumes: - mysql_data:/var/lib/mysql - ./scripts/mysql/init.sql:/docker-entrypoint-initdb.d/init.sql:ro @@ -25,7 +25,7 @@ services: networks: - widyu-network healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-rootpassword}"] + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"] interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose.yml b/docker-compose.yml index 79aa672..1969447 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,59 +9,59 @@ services: build: context: . dockerfile: Dockerfile - image: ${DOCKER_IMAGE_NAME:-widyu-api}:${IMAGE_TAG:-latest} + image: ${DOCKER_IMAGE_NAME}:${IMAGE_TAG} restart: unless-stopped environment: # Spring Profile (오버라이드에서 지정) - SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-local} + SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE} # Database (공통) - MYSQL_HOST: ${MYSQL_HOST:-mysql} - MYSQL_PORT: ${MYSQL_PORT:-3306} - DB_NAME: ${DB_NAME:-widyu_dev} + MYSQL_HOST: ${MYSQL_HOST} + MYSQL_PORT: ${MYSQL_PORT} + DB_NAME: ${DB_NAME} MYSQL_USERNAME: ${MYSQL_USERNAME} MYSQL_PASSWORD: ${MYSQL_PASSWORD} # Redis (공통) - REDIS_HOST: ${REDIS_HOST:-redis} - REDIS_PORT: ${REDIS_PORT:-6379} - REDIS_PASSWORD: ${REDIS_PASSWORD:-} + REDIS_HOST: ${REDIS_HOST} + REDIS_PORT: ${REDIS_PORT} + REDIS_PASSWORD: ${REDIS_PASSWORD} # JWT (공통) - JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_SECRET} - JWT_ACCESS_TOKEN_EXPIRATION_TIME: ${JWT_ACCESS_EXPIRATION:-7200000} - JWT_REFRESH_TOKEN_SECRET: ${JWT_REFRESH_SECRET} - JWT_REFRESH_TOKEN_EXPIRATION_TIME: ${JWT_REFRESH_EXPIRATION:-6024800000} - JWT_TEMPORARY_TOKEN_SECRET: ${JWT_TEMPORARY_SECRET} - JWT_TEMPORARY_TOKEN_EXPIRATION_TIME: ${JWT_TEMPORARY_EXPIRATION:-1800000} + JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET} + JWT_ACCESS_TOKEN_EXPIRATION_TIME: ${JWT_ACCESS_TOKEN_EXPIRATION_TIME} + JWT_REFRESH_TOKEN_SECRET: ${JWT_REFRESH_TOKEN_SECRET} + JWT_REFRESH_TOKEN_EXPIRATION_TIME: ${JWT_REFRESH_TOKEN_EXPIRATION_TIME} + JWT_TEMPORARY_TOKEN_SECRET: ${JWT_TEMPORARY_TOKEN_SECRET} + JWT_TEMPORARY_TOKEN_EXPIRATION_TIME: ${JWT_TEMPORARY_TOKEN_EXPIRATION_TIME} # OAuth (공통) - OAUTH_NAVER_CLIENT_ID: ${NAVER_CLIENT_ID} - OAUTH_NAVER_CLIENT_SECRET: ${NAVER_CLIENT_SECRET} - OAUTH_NAVER_REDIRECT_URI: ${NAVER_REDIRECT_URI} - OAUTH_KAKAO_CLIENT_ID: ${KAKAO_CLIENT_ID} - OAUTH_KAKAO_REDIRECT_URI: ${KAKAO_REDIRECT_URI} - OAUTH_KAKAO_ADMIN_KEY: ${KAKAO_ADMIN_KEY} - OAUTH_APPLE_IOS_CLIENT_ID: ${APPLE_IOS_CLIENT_ID} - OAUTH_APPLE_ANDROID_CLIENT_ID: ${APPLE_ANDROID_CLIENT_ID} - OAUTH_APPLE_TEAM_ID: ${APPLE_TEAM_ID} - OAUTH_APPLE_KEY_ID: ${APPLE_KEY_ID} - OAUTH_APPLE_PRIVATE_KEY: ${APPLE_PRIVATE_KEY} - OAUTH_APPLE_REDIRECT_URI: ${APPLE_REDIRECT_URI} + OAUTH_NAVER_CLIENT_ID: ${OAUTH_NAVER_CLIENT_ID} + OAUTH_NAVER_CLIENT_SECRET: ${OAUTH_NAVER_CLIENT_SECRET} + OAUTH_NAVER_REDIRECT_URI: ${OAUTH_NAVER_REDIRECT_URI} + OAUTH_KAKAO_CLIENT_ID: ${OAUTH_KAKAO_CLIENT_ID} + OAUTH_KAKAO_REDIRECT_URI: ${OAUTH_KAKAO_REDIRECT_URI} + OAUTH_KAKAO_ADMIN_KEY: ${OAUTH_KAKAO_ADMIN_KEY} + OAUTH_APPLE_IOS_CLIENT_ID: ${OAUTH_APPLE_IOS_CLIENT_ID} + OAUTH_APPLE_ANDROID_CLIENT_ID: ${OAUTH_APPLE_ANDROID_CLIENT_ID} + OAUTH_APPLE_TEAM_ID: ${OAUTH_APPLE_TEAM_ID} + OAUTH_APPLE_KEY_ID: ${OAUTH_APPLE_KEY_ID} + OAUTH_APPLE_PRIVATE_KEY: ${OAUTH_APPLE_PRIVATE_KEY} + OAUTH_APPLE_REDIRECT_URI: ${OAUTH_APPLE_REDIRECT_URI} # AWS S3 (공통) - AWS_ACCESS_KEY: ${AWS_ACCESS_KEY_ID} - AWS_SECRET_KEY: ${AWS_SECRET_ACCESS_KEY} - AWS_REGION: ${AWS_REGION:-ap-northeast-2} + AWS_ACCESS_KEY: ${AWS_ACCESS_KEY} + AWS_SECRET_KEY: ${AWS_SECRET_KEY} + AWS_REGION: ${AWS_REGION} S3_BUCKET_NAME: ${S3_BUCKET_NAME} # FCM (공통) - FIREBASE_CONFIG_PATH: ${FCM_CONFIG_PATH} + FIREBASE_CONFIG_PATH: ${FIREBASE_CONFIG_PATH} # SMS (공통) COOLSMS_API_KEY: ${COOLSMS_API_KEY} COOLSMS_API_SECRET: ${COOLSMS_API_SECRET} - COOLSMS_PHONE: ${COOLSMS_FROM_NUMBER} + COOLSMS_PHONE: ${COOLSMS_PHONE} # Payment (공통) PAYMENT_SECRET_KEY: ${PAYMENT_SECRET_KEY} @@ -70,8 +70,8 @@ services: MEDICINE_API_SERVICE_KEY: ${MEDICINE_API_KEY} # Swagger (공통) - SWAGGER_VERSION: ${SWAGGER_VERSION:-1.0.0} - SWAGGER_URL: ${SWAGGER_URL:-http://localhost} + SWAGGER_VERSION: ${SWAGGER_VERSION} + SWAGGER_URL: ${SWAGGER_URL} volumes: - app_logs:/app/logs @@ -90,7 +90,7 @@ services: restart: unless-stopped command: redis-server --maxmemory 256mb --maxmemory-policy allkeys-lru --appendonly yes ports: - - "${HOST_REDIS_PORT:-6380}:6379" + - "${HOST_REDIS_PORT}:6379" volumes: - redis_data:/data networks: @@ -106,8 +106,8 @@ services: image: nginx:1.25-alpine restart: unless-stopped ports: - - "${NGINX_HTTP_PORT:-80}:80" - - "${NGINX_HTTPS_PORT:-443}:443" + - "${NGINX_HTTP_PORT}:80" + - "${NGINX_HTTPS_PORT}:443" volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - nginx_logs:/var/log/nginx