Merge branch 'develop'

MS-Song · MS-Song · commit 9de966d63155 · 2025-01-31T00:44:13.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@
 /bin
 /.vscode
 /.externalToolBuilders
-.history/
+.history/
+.idea/
diff --git a/song7749-service-dbclient/Dockerfile b/song7749-service-dbclient/Dockerfile
@@ -1,4 +1,6 @@
 FROM openjdk:11-slim-buster
 ARG JAR_FILE=build/libs/song7749-module-dbclient.jar
 ADD ${JAR_FILE} boot.jar
-ENTRYPOINT ["java","-Dspring.profiles.active=local","-jar","/boot.jar"]
+ENV JAVA_OPTS=""
+ENTRYPOINT ["java","$JAVA_OPTS -Dspring.profiles.active=local","-jar","/boot.jar"]
+
diff --git a/song7749-service-incident/Dockerfile b/song7749-service-incident/Dockerfile
@@ -1,4 +1,6 @@
 FROM openjdk:11-slim-buster
 ARG JAR_FILE=build/libs/song7749-module-incident.jar
 ADD ${JAR_FILE} boot.jar
-ENTRYPOINT ["java","-Dspring.profiles.active=local","-jar","/boot.jar"]
+ENV JAVA_OPTS=""
+ENTRYPOINT ["java","$JAVA_OPTS -Dspring.profiles.active=local","-jar","/boot.jar"]
+
diff --git a/song7749-service-srcenter/Dockerfile b/song7749-service-srcenter/Dockerfile
@@ -1,4 +1,5 @@
 FROM openjdk:11-slim-buster
 ARG JAR_FILE=build/libs/song7749-module-srcenter.jar
 ADD ${JAR_FILE} boot.jar
-ENTRYPOINT ["java","-Dspring.profiles.active=local","-jar","/boot.jar"]
+ENV JAVA_OPTS=""
+ENTRYPOINT ["java","$JAVA_OPTS -Dspring.profiles.active=local","-jar","/boot.jar"]
