From f8770a0a88dc15ffd482a9bbd7f17f6627eda0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=84=B8=EC=A4=80?=
 <74056843+sejoon00@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:13:40 +0900
Subject: [PATCH] =?UTF-8?q?[fix/#38]=20cors=20url=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                         | 13 +------------
 Dockerfile.prod                    | 13 +------------
 docker-compose-dev.yml             |  3 ---
 docker-compose-prod.yml            |  3 ---
 src/main/resources/application.yml |  8 +++++++-
 5 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9609c42..a90d3c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,6 @@ FROM openjdk:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-ARG apm_agent=apm-agent/*.jar
-COPY ${apm_agent} apm-agent.jar
-
-ARG PROFILE=dev
 ENV SPRING_PROFILES_ACTIVE=${PROFILE}
 
-ENTRYPOINT ["java", \
-"-javaagent:/apm-agent.jar", \
-"-Delastic.apm.server_urls=http://apm-server:8200", \
-"-Delastic.apm.service_name=moplus-apm-agent", \
-"-Delastic.apm.application_packages=com.server", \
-"-Delastic.apm.environment=dev", \
-"-jar", \
-"/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/Dockerfile.prod b/Dockerfile.prod
index c659a89..a90d3c3 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -2,17 +2,6 @@ FROM openjdk:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-ARG apm_agent=apm-agent/*.jar
-COPY ${apm_agent} apm-agent.jar
-
-ARG PROFILE=dev
 ENV SPRING_PROFILES_ACTIVE=${PROFILE}
 
-ENTRYPOINT ["java", \
-"-javaagent:/apm-agent.jar", \
-"-Delastic.apm.server_urls=http://apm-server:8200", \
-"-Delastic.apm.service_name=moplus-apm-agent", \
-"-Delastic.apm.application_packages=com.server", \
-"-Delastic.apm.environment=prod", \
-"-jar", \
-"/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 821939f..b3c514e 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -28,7 +28,6 @@ services:
     networks:
       - moplus-dev
       - nginx-network
-      - apm_env
 
   mysql:
     image: mysql:8.0
@@ -56,6 +55,4 @@ networks:
   moplus-dev:
     driver: bridge
   nginx-network:
-    external: true
-  apm_env:
     external: true
\ No newline at end of file
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 10d3a57..a95bf5f 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -27,7 +27,6 @@ services:
     networks:
       - moplus-prod
       - nginx-network
-      - apm_env
 
   mysql:
     image: mysql:8.0
@@ -50,6 +49,4 @@ networks:
   moplus-prod:
     driver: bridge
   nginx-network:
-    external: true
-  apm_env:
     external: true
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c5ca596..3e3b140 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,4 +13,10 @@ spring:
 
 cors-allowed-origins:
   http://localhost:8080,
-  http://localhost:3000,
\ No newline at end of file
+  https://dev.mopl.kr,
+  http://dev.mopl.kr,
+  https://prod.mopl.kr,
+  http://prod.mopl.kr,
+  http://localhost:3000,
+  https://www.mopl.kr,
+  http://www.mopl.kr
\ No newline at end of file