🐛 bugfix: Docker에 의한 Redis 설정 오류 해결

Team-Motivoo · Mar 2, 2024 · d178311 · d178311
1 parent a75bcf4
commit d178311
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 25 deletions.
diff --git a/.github/workflows/batch-CD.yml b/.github/workflows/batch-CD.yml
@@ -4,7 +4,7 @@ on:  # 트리거
   push:
     branches: [ "develop" ]
     paths:
-      - motivoo-api/**
+      - motivoo-batch/**
       - motivoo-domain/**
       - motivoo-common/**
       - motivoo-external/**

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,8 +5,8 @@ services:
     image: redis:alpine
     ports:
       - "6379:6379"
-    networks:
-      - motivoo-net
+#    networks:
+#      - motivoo-net
 
   blue-api:
     container_name: blue-api
@@ -19,8 +19,8 @@ services:
       - TZ=Asia/Seoul
     depends_on:
       - redis
-    networks:
-      - motivoo-net
+#    networks:
+#      - motivoo-net
 
   blue-batch:
     container_name: blue-batch
@@ -31,8 +31,8 @@ services:
       - "8081:8081"
     environment:
       - TZ=Asia/Seoul
-    networks:
-      - motivoo-net
+#    networks:
+#      - motivoo-net
 
 
   green-api:
@@ -46,8 +46,8 @@ services:
       - TZ=Asia/Seoul
     depends_on:
       - redis
-    networks:
-      - motivoo-net
+#    networks:
+#      - motivoo-net
 
   green-batch:
     container_name: green-batch
@@ -58,9 +58,9 @@ services:
       - "8083:8081"
     environment:
       - TZ=Asia/Seoul
-    networks:
-      - motivoo-net
+#    networks:
+#      - motivoo-net
 
-networks:
-  motivoo-net:
-    driver: bridge
+#networks:
+#  motivoo-net:
+#    driver: bridge
diff --git a/scripts/api/deploy.sh b/scripts/api/deploy.sh
@@ -3,7 +3,7 @@ NOW_TIME="$(date +%Y)-$(date +%m)-$(date +%d) $(date +%H):$(date +%M):$(date +%S
 
 ALL_PORTS=("8080","8082")
 AVAILABLE_PORT=()
-SERVER_NAME=motivoo-server
+SERVER_NAME=motivoo-api-server
 
 DOCKER_PS_OUTPUT=$(docker ps | grep $SERVER_NAME)
 RUNNING_CONTAINER_NAME=$(echo "$DOCKER_PS_OUTPUT" | awk '{print $NF}')

diff --git a/scripts/batch/deploy.sh b/scripts/batch/deploy.sh
@@ -3,7 +3,7 @@ NOW_TIME="$(date +%Y)-$(date +%m)-$(date +%d) $(date +%H):$(date +%M):$(date +%S
 
 ALL_PORTS=("8081","8083")
 AVAILABLE_PORT=()
-SERVER_NAME=motivoo-server
+SERVER_NAME=motivoo-batch-server
 
 DOCKER_PS_OUTPUT=$(docker ps | grep $SERVER_NAME)
 RUNNING_CONTAINER_NAME=$(echo "$DOCKER_PS_OUTPUT" | awk '{print $NF}')
@@ -13,15 +13,6 @@ IS_GREEN_ACTIVATE=$(docker ps | grep green-batch)
 
 WEB_HEALTH_CHECK_URL=/api/health
 
-# Redis Docker Image Pull
-if [ -z "$IS_REDIS_ACTIVATE" ];then
-  echo "###### REDIS ######"
-  echo "[$NOW_TIME] Redis 도커 이미지 pull"
-  docker-compose pull redis
-  echo "[$NOW_TIME] Redis 컨테이너 Up (빌드 & 실행)"
-  docker-compose up -d redis
-fi
-
 # 실행 중인 서버 포트 확인
 if [ ${RUNNING_CONTAINER_NAME} == "blue-batch" ]; then
     echo "[$NOW_TIME] 실행 중인 서버 포트: blue-batch (:8081)"