Merge remote-tracking branch 'origin/develop' into develop

hellokitty-coding-club · Oct 12, 2023 · e356698 · e356698
2 parents d4adc68 + d0553db
commit e356698
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/API-Server/Dockerfile b/API-Server/Dockerfile
@@ -3,4 +3,4 @@ FROM eclipse-temurin:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-CMD ["java", "-Dspring.profiles.active=dev", "-jar", "app.jar"]
+CMD ["java", "-jar", "app.jar"]
diff --git a/API-Server/src/main/resources/application-prod.yml b/API-Server/src/main/resources/application-prod.yml
@@ -2,7 +2,6 @@ spring:
   config:
     activate:
       on-profile: prod
-server:
 
   datasource:
     url: ${PROD_DB_HOST}
@@ -53,4 +52,3 @@ server:
     redis:
       cluster:
         nodes: ${PROD_REDIS_NODES}
-  port: 8090