From 3e941440c7f18e85c3fc212b604d734dd5862ddb 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: Fri, 7 Mar 2025 00:41:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=EC=9D=B8=ED=95=9C=20docker?= =?UTF-8?q?-compose=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index d02a6ff..939e64e 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -53,7 +53,7 @@ volumes: driver_opts: type: none o: bind - device: ../mopl_data/dev_data + device: ../mopl_data/prod_data networks: pointer-prod: From bab91dc6833626bcfb8771c7b4bd09b08e0f320e 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: Fri, 7 Mar 2025 02:02:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20cors=20=EC=83=88=EB=A1=9C=EC=9A=B4?= =?UTF-8?q?=20=EB=8F=84=EB=A9=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-dev.yml | 4 ++-- .github/workflows/CD-prod.yml | 4 ++-- src/main/resources/application.yml | 21 ++++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index 46e603e..dc7ed10 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -32,6 +32,6 @@ jobs: fi ./gradlew clean build - docker rm -f moplus-server-dev --force - docker rmi moplus-server-dev + docker rm -f pointer-server-dev --force + docker rmi pointer-server-dev docker-compose -f docker-compose-dev.yml -p pointer-dev up --build -d diff --git a/.github/workflows/CD-prod.yml b/.github/workflows/CD-prod.yml index 4e26607..6e16c69 100644 --- a/.github/workflows/CD-prod.yml +++ b/.github/workflows/CD-prod.yml @@ -31,7 +31,7 @@ jobs: fi ./gradlew clean build - docker rm -f moplus-server-prod --force - docker rmi moplus-server-prod + docker rm -f pointer-server-prod --force + docker rmi pointer-server-prod docker-compose -f docker-compose-prod.yml -p pointer-prod up --build -d diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f6a00c5..4d1174e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,13 +13,20 @@ spring: cors-allowed-origins: http://localhost:8080, - https://dev.mopl.kr, - http://dev.mopl.kr, - https://prod.mopl.kr, - http://prod.mopl.kr, + https://dev.math-pointer.com, + http://dev.math-pointer.com, + https://prod.math-pointer.com, + http://prod.math-pointer.com, http://localhost:3000, http://localhost:5173, - https://www.mopl.kr, - http://www.mopl.kr, - https://mopl-admin.vercel.app, + https://ppp.admin.math-pointer.com, + http://ppp.admin.math-pointer.com, + https://ppp.dev.admin.math-pointer.com, + http://ppp.dev.admin.math-pointer.com, + https://www.math-pointer.com, + http://www.math-pointer.com, + https://www.dev.math-pointer.com + http://www.dev.math-pointer.com + +