[ALL] chore: 그린,블루별 서비스 이름 변경 (#578)

* chore: 그린,블루별 서비스 이름 변경 * chore: 불필요한 변수 제거
woowacourse-teams · Oct 19, 2023 · de4d33d · de4d33d
1 parent f003dd2
commit de4d33d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/compose-blue.yml b/compose-blue.yml
@@ -1,14 +1,10 @@
 version: "3"
 services:
-  frontend:
+  frontend-blue:
     image: ${DOCKER_USERNAME}/dong-gle-frontend-${INFRA_PROFILE}
-    ports:
-      - 3000:3000
 
-  backend:
+  backend-blue:
     image: ${DOCKER_USERNAME}/dong-gle-backend-${INFRA_PROFILE}
-    ports:
-      - 8080:8080
     volumes:
       - /home/ubuntu/logs/:/logs/
     environment:

diff --git a/compose-green.yml b/compose-green.yml
@@ -1,14 +1,10 @@
 version: "3"
 services:
-  frontend:
+  frontend-green:
     image: ${DOCKER_USERNAME}/dong-gle-frontend-${INFRA_PROFILE}
-    ports:
-      - 3001:3000
 
-  backend:
+  backend-green:
     image: ${DOCKER_USERNAME}/dong-gle-backend-${INFRA_PROFILE}
-    ports:
-      - 8081:8080
     volumes:
       - /home/ubuntu/logs/:/logs/
     environment:

diff --git a/conf-dev/nginx.template b/conf-dev/nginx.template
@@ -17,22 +17,22 @@ server{
 
         location /api {
                 rewrite ^/api/(.*) /$1 break;
-                proxy_pass http://backend:${BACKEND_PORT};
+                proxy_pass http://backend-${AFTER_COMPOSE_COLOR}:8080;
                 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;
         }
         location / {
-                proxy_pass http://frontend:${FRONTEND_PORT};
+                proxy_pass http://frontend-${AFTER_COMPOSE_COLOR}:3000;
                 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;
         }
 
         location /v3 {
-            proxy_pass http://backend:${BACKEND_PORT};
+            proxy_pass http://backend-${AFTER_COMPOSE_COLOR}:8080;
             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/conf-prod/nginx.template b/conf-prod/nginx.template
@@ -17,22 +17,22 @@ server{
 
         location /api {
                 rewrite ^/api/(.*) /$1 break;
-                proxy_pass http://backend:${BACKEND_PORT};
+                proxy_pass http://backend-${AFTER_COMPOSE_COLOR}:8080;
                 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;
         }
         location / {
-                proxy_pass http://frontend:${FRONTEND_PORT};
+                proxy_pass http://frontend-${AFTER_COMPOSE_COLOR}:3000;
                 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;
         }
 
         location /v3 {
-            proxy_pass http://backend:${BACKEND_PORT};
+            proxy_pass http://backend-${AFTER_COMPOSE_COLOR}:8080;
             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/deploy.sh b/deploy.sh
@@ -19,16 +19,12 @@ if [ -z "$EXIST_BLUE" ]; then
     sudo docker compose -p compose-blue -f compose-blue.yml up -d
     BEFORE_COMPOSE_COLOR="green"
     AFTER_COMPOSE_COLOR="blue"
-    export BACKEND_PORT=8080
-    export FRONTEND_PORT=3000
 else
     echo "green up"
     sudo docker compose -p compose-green -f compose-green.yml pull
     sudo docker compose -p compose-green -f compose-green.yml up -d
     BEFORE_COMPOSE_COLOR="blue"
     AFTER_COMPOSE_COLOR="green"
-    export BACKEND_PORT=8081
-    export FRONTEND_PORT=3001
 fi
 
 sleep 10
@@ -53,12 +49,14 @@ else
     exit 1
   fi
 fi
-
+
+export AFTER_COMPOSE_COLOR 
+
 # 새로운 컨테이너가 제대로 떴는지 확인
 EXIST_AFTER=$(sudo docker compose -p compose-${AFTER_COMPOSE_COLOR} -f compose-${AFTER_COMPOSE_COLOR}.yml ps | grep Up)
 if [ -n "$EXIST_AFTER" ]; then
   # nginx.config를 컨테이너에 맞게 변경해주고 reload 한다
-  envsubst '${FRONTEND_PORT},${BACKEND_PORT}' < conf-${INFRA_PROFILE}/nginx.template > conf-${INFRA_PROFILE}/nginx.conf
+  envsubst '${AFTER_COMPOSE_COLOR}' < conf-${INFRA_PROFILE}/nginx.template > conf-${INFRA_PROFILE}/nginx.conf
   sudo docker compose -f compose-nginx.yml exec nginx nginx -s reload
 
   # 이전 컨테이너 종료