From c81b17c06a43d6271a905776d5d6b8ce5ef824ec Mon Sep 17 00:00:00 2001 From: dmori Date: Wed, 25 Feb 2026 05:52:05 +0900 Subject: [PATCH 1/4] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EC=9E=A0=EC=8B=9C=20=EB=B0=B0?= =?UTF-8?q?=ED=8F=AC=20=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 36bdafa9..8964ad31 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,6 +2,8 @@ name: COCKPLE_CD on: push: branches: [ "main", "develop" ] + pull_request: + branches: [ "develop"] permissions: contents: read From 31828f2166e23adeb1f3aa9c8abcd0d65e304df2 Mon Sep 17 00:00:00 2001 From: dmori Date: Wed, 25 Feb 2026 11:54:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?debug:=20Nginx=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=9B=B9=EC=86=8C=EC=BC=93=20=ED=97=A4=EB=8D=94=20=EC=97=85?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C=EB=A5=BC=20=EC=A7=80?= =?UTF-8?q?=EC=9B=90=ED=95=98=EC=A7=80=20=EC=95=8A=EC=95=98=EB=8D=98=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=EB=A5=BC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx/conf.d/prod.conf | 11 +++++++++++ nginx/conf.d/staging.conf | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/nginx/conf.d/prod.conf b/nginx/conf.d/prod.conf index 314b3e38..d44e6d45 100644 --- a/nginx/conf.d/prod.conf +++ b/nginx/conf.d/prod.conf @@ -2,6 +2,17 @@ server { listen 80; server_name cockple.store; + location /ws/ { + proxy_pass http://cockple-app:8080; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; + } + location / { proxy_pass http://cockple-app:8080; proxy_set_header Host $host; diff --git a/nginx/conf.d/staging.conf b/nginx/conf.d/staging.conf index 2a222c17..e050fc27 100644 --- a/nginx/conf.d/staging.conf +++ b/nginx/conf.d/staging.conf @@ -2,6 +2,17 @@ server { listen 80; server_name staging.cockple.store; + location /ws/ { + proxy_pass http://cockple-app-staging:8080; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; + } + location / { proxy_pass http://cockple-app-staging:8080; proxy_set_header Host $host; From e25e4710c58abb3d16d6d31f1d5fc76f7438aaaf Mon Sep 17 00:00:00 2001 From: dmori Date: Wed, 25 Feb 2026 12:01:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EC=9E=A0=EC=8B=9C=20=EB=B0=94?= =?UTF-8?q?=EA=BF=A8=EB=8D=98=20=EB=B0=B0=ED=8F=AC=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8964ad31..36bdafa9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,8 +2,6 @@ name: COCKPLE_CD on: push: branches: [ "main", "develop" ] - pull_request: - branches: [ "develop"] permissions: contents: read From 3084edc90982891a2e9496f8bbdb18adadb718ac Mon Sep 17 00:00:00 2001 From: dmori Date: Wed, 25 Feb 2026 12:02:22 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20WebSocket=20=ED=97=88=EC=9A=A9=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EC=97=90=20staging=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/umc/cockple/demo/global/config/WebSocketConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/umc/cockple/demo/global/config/WebSocketConfig.java b/src/main/java/umc/cockple/demo/global/config/WebSocketConfig.java index 8efc432a..aea6747b 100644 --- a/src/main/java/umc/cockple/demo/global/config/WebSocketConfig.java +++ b/src/main/java/umc/cockple/demo/global/config/WebSocketConfig.java @@ -21,7 +21,7 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { registry .addHandler(chatWebSocketHandler, "/ws/chats") .addInterceptors(jwtWebSocketAuthInterceptor) - .setAllowedOrigins("http://localhost:5173", "https://cockple.store", "https://cockple-fe.vercel.app/") + .setAllowedOrigins("http://localhost:5173", "https://cockple.store", "https://cockple-fe.vercel.app/", "https://staging.cockple.store") .withSockJS(); // 브라우저 호환성 } }