Fix: 환경변수 이름과 compose 주입 방식 정리

Author: lunarbae628

infra/docker-compose.stg.yml

@@ -6,17 +6,6 @@ services:
     container_name: docsa-app-stg
     restart: unless-stopped
     env_file: .stg.env
-    environment:
-      SPRING_DATA_MONGODB_URI: ${SPRING_DATA_MONGODB_URI}
-      SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME}
-      #SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD}
-      SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
-      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
-      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
-      SERVER_SERVLET_SESSION_COOKIE_NAME: ${SESSION_COOKIE_NAME}
-      SERVER_SERVLET_SESSION_COOKIE_DOMAIN: ${SESSION_COOKIE_DOMAIN}
-      SPRINGDOC_SWAGGER-UI_SERVERS_URL: ${SWAGGER_SERVER_URL}
-      SPRING_JPA_HIBERNATE_DDL_AUTO: ${DDL_AUTO}
     depends_on:
        mysql:
           condition: service_healthy

infra/docker-compose.yml

@@ -6,16 +6,6 @@ services:
     container_name: docsa-app
     restart: unless-stopped
     env_file: .env
-    environment:
-      SPRING_DATA_MONGODB_URI: ${SPRING_DATA_MONGODB_URI}
-      SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME}
-      SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD}
-      SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
-      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
-      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
-      SERVER_SERVLET_SESSION_COOKIE_NAME: ${SESSION_COOKIE_NAME}
-      SERVER_SERVLET_SESSION_COOKIE_DOMAIN: ${SESSION_COOKIE_DOMAIN}
-      SPRINGDOC_SWAGGER-UI_SERVERS_URL: ${SWAGGER_SERVER_URL}
     depends_on:
       mysql:
         condition: service_healthy

src/main/resources/application-local.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/docsa
-    username: ${MYSQL_USERNAME}
-    password: ${MYSQL_PASSWORD}
+    url: ${SPRING_DATASOURCE_URL:jdbc:mysql://localhost:3306/docsa}
+    username: ${SPRING_DATASOURCE_USERNAME:${MYSQL_USERNAME}}
+    password: ${SPRING_DATASOURCE_PASSWORD:${MYSQL_PASSWORD}}
 
   mail:
     # smtp: smtp.gmail.com, port: 587 / mailpit: localhost, port: 1025
@@ -23,7 +23,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: ${DDL_AUTO:create-drop}
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:${DDL_AUTO:create-drop}}
     show-sql: false
     properties:
       hibernate:

src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${MYSQL_PROD_URL}
-    username: ${MYSQL_USERNAME}
-    password: ${MYSQL_PASSWORD}
+    url: ${SPRING_DATASOURCE_URL:${MYSQL_PROD_URL}}
+    username: ${SPRING_DATASOURCE_USERNAME:${MYSQL_USERNAME}}
+    password: ${SPRING_DATASOURCE_PASSWORD:${MYSQL_PASSWORD}}
 
   flyway:
     enabled: ${FLYWAY_ENABLED:true}
@@ -22,7 +22,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: ${DDL_AUTO:validate}
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:${DDL_AUTO:validate}}
     database-platform: org.hibernate.dialect.MySQL8Dialect
     show-sql: false
     properties:

src/main/resources/application-stg.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${MYSQL_PROD_URL}
-    username: ${MYSQL_USERNAME}
-    password: ${MYSQL_PASSWORD}
+    url: ${SPRING_DATASOURCE_URL:${MYSQL_PROD_URL}}
+    username: ${SPRING_DATASOURCE_USERNAME:${MYSQL_USERNAME}}
+    password: ${SPRING_DATASOURCE_PASSWORD:${MYSQL_PASSWORD}}
 
   flyway:
     enabled: ${FLYWAY_ENABLED:true}
@@ -22,7 +22,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: ${DDL_AUTO:validate}
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:${DDL_AUTO:validate}}
     database-platform: org.hibernate.dialect.MySQL8Dialect
     show-sql: false
     properties:

src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
 
   data:
     mongodb:
-      uri: ${MONGO_URI}
+      uri: ${SPRING_DATA_MONGODB_URI:${MONGO_URI}}
 
   mail:
     connection-timeout: 5000