Merge pull request #7 from team-MoPlus/develop

Develop

Author: sejoon00

docker-compose-dev.yml

@@ -10,8 +10,19 @@ services:
       - 8081:8080
     environment:
       - TZ=Asia/Seoul
-    env_file:
-      - .env.dev
+      - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
+      - SPRING_DATASOURCE_USERNAME=${DEV_MYSQL_USER}
+      - SPRING_DATASOURCE_PASSWORD=${DEV_MYSQL_PASSWORD}
+      - SENTRY_DSN=${SENTRY_DSN}
+      - CLOUD_AWS_S3_BUCKET=${S3_BUCKET}
+      - CLOUD_AWS_S3_SIGNATURE_VERSION=AWS4-HMAC-SHA256
+      - CLOUD_AWS_CREDENTIALS_ACCESS_KEY=${AWS_ACCESS_KEY}
+      - CLOUD_AWS_CREDENTIALS_SECRET_KEY=${AWS_SECRET_KEY}
+      - CLOUD_AWS_REGION_STATIC=${AWS_REGION}
+      - CLOUD_AWS_REGION_AUTO=false
+      - CLOUD_AWS_STACK_AUTO=false
+
     depends_on:
       - mysql
     networks:
@@ -21,8 +32,11 @@ services:
   mysql:
     image: mysql:8.0
     container_name: moplus-mysql-dev
-    env_file:
-      - .env.dev
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DEV_MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${DEV_MYSQL_DATABASE}
+      MYSQL_USER: ${DEV_MYSQL_USER}
+      MYSQL_PASSWORD: ${DEV_MYSQL_PASSWORD}
     ports:
       - "3307:3306"
     volumes:

docker-compose-prod.yml

@@ -10,8 +10,18 @@ services:
       - 8080:8080
     environment:
       - TZ=Asia/Seoul
-    env_file:
-      - .env.prod
+      - SPRING_PROFILES_ACTIVE=prod
+      - SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
+      - SPRING_DATASOURCE_USERNAME=${PROD_MYSQL_USER}
+      - SPRING_DATASOURCE_PASSWORD=${PROD_MYSQL_PASSWORD}
+      - SENTRY_DSN=${SENTRY_DSN}
+      - CLOUD_AWS_S3_BUCKET=${S3_BUCKET}
+      - CLOUD_AWS_S3_SIGNATURE_VERSION=AWS4-HMAC-SHA256
+      - CLOUD_AWS_CREDENTIALS_ACCESS_KEY=${AWS_ACCESS_KEY}
+      - CLOUD_AWS_CREDENTIALS_SECRET_KEY=${AWS_SECRET_KEY}
+      - CLOUD_AWS_REGION_STATIC=${AWS_REGION}
+      - CLOUD_AWS_REGION_AUTO=false
+      - CLOUD_AWS_STACK_AUTO=false
     depends_on:
       - mysql
     networks:
@@ -21,8 +31,11 @@ services:
   mysql:
     image: mysql:8.0
     container_name: moplus-mysql-prod
-    env_file:
-      - .env.prod
+    environment:
+      MYSQL_ROOT_PASSWORD: ${PROD_MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${PROD_MYSQL_DATABASE}
+      MYSQL_USER: ${PROD_MYSQL_USER}
+      MYSQL_PASSWORD: ${PROD_MYSQL_PASSWORD}
     ports:
       - "3306:3306"
     volumes:

src/main/java/com/moplus/moplus_server/MoplusServerApplication.java

@@ -2,8 +2,10 @@
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.servers.Server;
+import java.util.Arrays;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @OpenAPIDefinition(servers = {@Server(url = "https://dev.mopl.kr", description = "Default Server URL")})
@@ -12,7 +14,16 @@
 public class MoplusServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(MoplusServerApplication.class, args);
+        var applicationContext = SpringApplication.run(MoplusServerApplication.class, args);
+        Environment environment = applicationContext.getEnvironment();
+
+        String[] activeProfiles = environment.getActiveProfiles();
+        if (activeProfiles.length == 0) {
+            System.out.println("No active profiles are set.");
+        } else {
+            System.out.println("Active profiles: " + Arrays.toString(activeProfiles));
+        }
     }
 
+
 }

src/main/resources/application-datasource.yml

@@ -3,7 +3,7 @@ spring:
     activate:
       on-profile: "datasource"
   datasource:
-    url: jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${DB_NAME}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
+    url: jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
     driver-class-name: com.mysql.cj.jdbc.Driver
     password: ${MYSQL_PASSWORD}
     username: ${MYSQL_USERNAME}

src/main/resources/application-dev.yml

@@ -5,6 +5,20 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+        use_sql_comments: true
+  datasource:
+    url: jdbc:mysql://moplus-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8
+    username: ${DEV_MYSQL_USER}
+    password: ${DEV_MYSQL_PASSWORD}
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 10 # default
+      connection-timeout: 3000 # 30 seconds in milliseconds
+      keepalive-time: 600000 # 5 minutes in milliseconds
 
 logging:
   level:

src/main/resources/application-prod.yml

@@ -5,6 +5,15 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+  datasource:
+    url: jdbc:mysql://moplus-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    password: ${PROD_MYSQL_PASSWORD}
+    username: ${PROD_MYSQL_USER}
+    hikari:
+      maximum-pool-size: 10 # default
+      connection-timeout: 3000 # 30 seconds in milliseconds
+      keepalive-time: 600000 # 5 minutes in milliseconds
 
 logging:
   level:

src/main/resources/application.yml

@@ -2,8 +2,9 @@ spring:
   profiles:
     active: ${profile}
     group:
-      local: "local, datasource"
-      dev: "dev, datasource"
+      local: "local"
+      dev: "dev"
+      prod: "prod"
     include:
       - aws
   mvc: