chore: deploy.sh에 어드민 모듈 내용 추가

depromeet · Dec 2, 2024 · cdfb886 · cdfb886
1 parent e912fb0
commit cdfb886
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 4 deletions.
diff --git a/.github/workflows/aws-cicd-prod.yml b/.github/workflows/aws-cicd-prod.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - chore/migration
+      -  chore/LA-28
 
 env:
   REGISTRY: "docker.io"

diff --git a/layer-admin/src/main/java/org/layer/member/controller/AdminMemberController.java b/layer-admin/src/main/java/org/layer/member/controller/AdminMemberController.java
@@ -10,7 +10,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-@RequestMapping("/admin/members")
+@RequestMapping("/members")
 @RequiredArgsConstructor
 @RestController
 public class AdminMemberController implements AdminMemberApi {

diff --git a/layer-api/infra/production/docker-compose-blue.yaml b/layer-api/infra/production/docker-compose-blue.yaml
@@ -13,6 +13,21 @@ services:
       - ./tokens:/config/tokens
     networks:
       - app-network
+      -
+  layer-admin-blue:
+    image: docker.io/clean01/layer-server_layer-admin:latest
+    container_name: layer-admin-blue
+    ports:
+      - "8082:8080"
+    environment:
+      - TZ=Asia/Seoul
+      - SPRING_PROFILES_ACTIVE=prod
+    volumes:
+      - ./application-secret.properties:/config/application-secret.properties
+      - ./log:/log
+      - ./tokens:/config/tokens
+    networks:
+      - app-network
 
   batch-job-blue:
     image: docker.io/clean01/layer-server_layer-batch:latest

diff --git a/layer-api/infra/production/docker-compose-green.yaml b/layer-api/infra/production/docker-compose-green.yaml
@@ -14,6 +14,21 @@ services:
     networks:
       - app-network
 
+  layer-admin-green:
+    image: docker.io/clean01/layer-server_layer-admin:latest
+    container_name: layer-admin-green
+    ports:
+      - "8082:8080"
+    environment:
+      - TZ=Asia/Seoul
+      - SPRING_PROFILES_ACTIVE=prod
+    volumes:
+      - ./application-secret.properties:/config/application-secret.properties
+      - ./log:/log
+      - ./tokens:/config/tokens
+    networks:
+      - app-network
+
   batch-job-green:
     image: docker.io/clean01/layer-server_layer-batch:latest
     container_name: layer-batch-green

diff --git a/layer-api/infra/production/nginx.blue.conf b/layer-api/infra/production/nginx.blue.conf
@@ -8,12 +8,22 @@ http {
     server {
         listen 80;
 
+        # 기존 라우팅 (서비스 api)
         location / {
             proxy_pass http://layer-api;
             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 $scheme;
         }
+
+        # /admin 요청 라우팅
+        location /layer-admin {
+            proxy_pass http://localhost:8083;
+            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 $scheme;
+        }
     }
-}
+}
diff --git a/layer-api/infra/production/nginx.green.conf b/layer-api/infra/production/nginx.green.conf
@@ -8,12 +8,22 @@ http {
     server {
         listen 80;
 
+        # 기존 라우팅 (서비스 api)
         location / {
             proxy_pass http://layer-api;
             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 $scheme;
         }
+
+        # /admin 요청 라우팅
+        location /admin {
+            proxy_pass http://localhost:8082;
+            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 $scheme;
+        }
     }
-}
+}