diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0b644e7f..cbeb34b9 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: Deploy to OCIWP
+name: Deploy to OCIWP
on:
push:
@@ -64,11 +64,18 @@ jobs:
sleep 5
ACTIVE_PROFILE=dev docker compose up -d tool-payment-$TARGET
- # 4.5. ?�거??컨테?�너 �?�� (?�트 충돌 방�?, Nginx ?�외)
+ # 4.5. 제거할 컨테이너 (포트 충돌 방지, Nginx 제외)
echo "Finding and killing legacy containers holding our ports..."
+ for port in 6379 8089 8281 8282 8283 8284 8285 8288; do
+ cid=$(docker ps -q --filter "publish=$port")
+ if [ ! -z "$cid" ]; then
+ echo "Force killing container $cid using port $port"
+ docker rm -f $cid
+ fi
+ done
- # 4.6. Nginx 초기 ?�정 �?기동
+ # 4.6. Nginx 초기 ?정 ?기동
mkdir -p ./nginx/conf.d
echo "Initializing Nginx config to $TARGET..."
cp ./nginx/${TARGET}.conf ./nginx/conf.d/default.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index 1aa8c9b3..aa82c5ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,6 +46,7 @@ services:
nginx:
image: nginx:latest
ports:
+ - "8281:8281"
- "8282:8282"
- "8283:8283"
- "8284:8284"
@@ -172,8 +173,6 @@ services:
build:
context: .
dockerfile: dap-gateway/Dockerfile
- ports:
- - "8281:8081"
volumes:
- ./:/src
depends_on:
diff --git a/nginx/blue.conf b/nginx/blue.conf
index b521bccf..d53e28fa 100644
--- a/nginx/blue.conf
+++ b/nginx/blue.conf
@@ -6,7 +6,9 @@ server {
listen 8281;
location / {
- add_header Content-Type text/html;
- return 200 'Nginx Static Page
';
+ proxy_pass http://gateway;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
diff --git a/nginx/green.conf b/nginx/green.conf
index 5493d2b9..d3920919 100644
--- a/nginx/green.conf
+++ b/nginx/green.conf
@@ -6,7 +6,9 @@ server {
listen 8281;
location / {
- add_header Content-Type text/html;
- return 200 'Nginx Static Page
';
+ proxy_pass http://gateway;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}