change deploy.yml

Author: yunrry

docker-compose.yml

@@ -45,6 +45,8 @@ services:
 
   # SpringBoot Application - Blue
   app-blue:
+    profiles:
+      - blue
     build:
       dockerfile: Dockerfile
     image: dormung-springboot:latest
@@ -56,12 +58,11 @@ services:
         condition: service_healthy
     environment:
       - SPRING_PROFILES_ACTIVE=prod
-      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE:-dormung}?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul
-      - SPRING_DATASOURCE_USERNAME=${MYSQL_USER:-dormung_user}
-      - SPRING_DATASOURCE_PASSWORD=${MYSQL_PASSWORD:-dormung_password}
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul
+      - SPRING_DATASOURCE_USERNAME=${MYSQL_USER}
+      - SPRING_DATASOURCE_PASSWORD=${MYSQL_PASSWORD}
       - SPRING_DATA_REDIS_HOST=redis
       - SPRING_DATA_REDIS_PORT=6379
-      - SPRING_DATA_REDIS_PASSWORD=${REDIS_PASSWORD:-}
       - SERVER_PORT=8080
       - JAVA_OPTS=-Xms256m -Xmx1g -XX:+UseG1GC -XX:MaxGCPauseMillis=200
       - BUILD_INFO=${BUILD_TAG:-latest}
@@ -74,14 +75,16 @@ services:
       - dormung-network
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/api/actuator/health"]
       interval: 30s
-      timeout: 10s
+      timeout: 20s
       retries: 3
-      start_period: 60s
+      start_period: 120s
 
   # SpringBoot Application - Green
   app-green:
+    profiles:
+      - green
     build:
       dockerfile: Dockerfile
     image: dormung-springboot:latest
@@ -93,12 +96,11 @@ services:
         condition: service_healthy
     environment:
       - SPRING_PROFILES_ACTIVE=prod
-      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE:-dormung}?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul
-      - SPRING_DATASOURCE_USERNAME=${MYSQL_USER:-dormung_user}
-      - SPRING_DATASOURCE_PASSWORD=${MYSQL_PASSWORD:-dormung_password}
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul
+      - SPRING_DATASOURCE_USERNAME=${MYSQL_USER}
+      - SPRING_DATASOURCE_PASSWORD=${MYSQL_PASSWORD}
       - SPRING_DATA_REDIS_HOST=redis
       - SPRING_DATA_REDIS_PORT=6379
-      - SPRING_DATA_REDIS_PASSWORD=${REDIS_PASSWORD:-}
       - SERVER_PORT=8080
       - JAVA_OPTS=-Xms256m -Xmx1g -XX:+UseG1GC -XX:MaxGCPauseMillis=200
       - BUILD_INFO=${BUILD_TAG:-latest}
@@ -111,20 +113,17 @@ services:
       - dormung-network
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/api/actuator/health"]
       interval: 30s
-      timeout: 10s
+      timeout: 20s
       retries: 3
-      start_period: 60s
-    profiles:
-      - green
+      start_period: 120s
+
 
   # Nginx Load Balancer
   nginx:
     image: nginx:alpine
     container_name: nginx
-    depends_on:
-      - app-blue
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./nginx/conf.d:/etc/nginx/conf.d:ro
@@ -137,7 +136,7 @@ services:
       - dormung-network
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/health"]
+      test: [ "CMD", "curl", "-f", "http://localhost/health" ]
       interval: 30s
       timeout: 10s
       retries: 3

nginx/nginx.conf

@@ -4,12 +4,8 @@ events {
 
 http {
     upstream springboot {
-        server springboot-blue:8080 max_fails=3 fail_timeout=30s;
-        # server springboot-green:8080 max_fails=3 fail_timeout=30s;
-    }
-
-    upstream python {
-        server python-app:8000 max_fails=3 fail_timeout=30s;
+        server app-blue:8080 max_fails=3 fail_timeout=30s;
+        # server app-green:8080 max_fails=3 fail_timeout=30s;
     }
 
     proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
@@ -24,9 +20,19 @@ http {
         listen 80;
         server_name localhost;
 
+        # CORS 설정
+        add_header Access-Control-Allow-Origin "https://dormung.netlify.app" always;
+        add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always;
+        add_header Access-Control-Allow-Headers "Content-Type, Authorization" always;
+
+        # OPTIONS 요청 처리
+        if ($request_method = 'OPTIONS') {
+            return 204;
+        }
+
         # SpringBoot API
         location /api/ {
-            proxy_pass http://springboot/;
+            proxy_pass http://springboot/api/;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -35,7 +41,6 @@ http {
             proxy_set_header Connection "";
         }
 
-
         # Health check
         location /health {
             access_log off;

src/main/resources/application.yml

@@ -1,15 +1,15 @@
 spring:
   application:
-    name: dormung-springboot
+    name: srpingboot-app
+  profiles:
+    active: "prod"
 
-  # Database
   datasource:
-    url: "jdbc:mysql://localhost:3306/jeju_audio_guide?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul"
-    username: ${SPRING_DATASOURCE_USERNAME}
-    password: ${MYSQL_ROOT_PASSWORD}
+    url: jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul
+    username: ${MYSQL_USER}
+    password: ${MYSQL_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
 
-  # JPA/Hibernate
   jpa:
     hibernate:
       ddl-auto: update
@@ -19,21 +19,18 @@ spring:
         dialect: org.hibernate.dialect.MySQL8Dialect
         format_sql: true
 
-  # Redis
   data:
     redis:
-      host: ${SPRING_DATA_REDIS_HOST:localhost}
+      host: ${SPRING_DATA_REDIS_HOST:redis}
       port: ${SPRING_DATA_REDIS_PORT:6379}
       timeout: 2000ms
 
-# Server
 server:
   port: ${SERVER_PORT:8080}
   servlet:
     context-path: /api
   shutdown: graceful
 
-# Actuator
 management:
   endpoints:
     web:
@@ -43,11 +40,8 @@ management:
     health:
       show-details: always
 
-# Logging
 logging:
   level:
     com.mycompany.goormthonserver: INFO
     org.springframework.web: WARN
-    org.hibernate.SQL: WARN
-  pattern:
-    console: "%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    org.hibernate.SQL: WARN