Merge pull request #319 from Podo-Store/develop

fix: redis container 실행 환경 변경(#317)

Author: cjh-19

.github/workflows/deploy.yml

@@ -69,6 +69,7 @@ jobs:
         mkdir deploy
         cp ./docker/docker-compose.blue.yml ./deploy/
         cp ./docker/docker-compose.green.yml ./deploy/
+        cp ./docker/docker-compose.redis.yml ./deploy/
         cp ./appspec.yml ./deploy/
         cp ./docker/Dockerfile ./deploy/
         cp ./scripts/*.sh ./deploy/

.gitignore

@@ -43,4 +43,7 @@ src/main/resources/application.properties
 src/main/resources/application.yml
 
 # .github/ISSUE_TEMPLATE 디렉터리 안의 YAML 파일 제외
-!**/.github/ISSUE_TEMPLATE/*.yml
+!**/.github/ISSUE_TEMPLATE/*.yml
+
+# docker-compose.yml 제외
+!**/docker/*.yml

docker/docker-compose.blue.yml

@@ -14,16 +14,10 @@ services:
     # 환경변수 - 한국 시간 설정
     environment:
       - TZ=Asia/Seoul
-      - SPRING_DATA_REDIS_HOST=redis-blue
+      - SPRING_DATA_REDIS_HOST=redis
       - SPRING_DATA_REDIS_PORT=6379
-    depends_on:
-      - redis
     stop_grace_period: 10s
-  redis:
-    image: redis
-    container_name: redis-blue
-    ports:
-      - "6380:6379"
+
 networks:
   default:
     external: true

docker/docker-compose.green.yml

@@ -9,16 +9,10 @@ services:
     container_name: spring-green
     environment:
       - TZ=Asia/Seoul
-      - SPRING_DATA_REDIS_HOST=redis-green
+      - SPRING_DATA_REDIS_HOST=redis
       - SPRING_DATA_REDIS_PORT=6379
-    depends_on:
-      - redis
     stop_grace_period: 10s
-  redis:
-    image: redis
-    container_name: redis-green
-    ports:
-      - "6381:6379"
+
 networks:
   default:
     external: true

docker/docker-compose.redis.yml

@@ -0,0 +1,18 @@
+version: "3.8"
+
+services:
+  redis:
+    image: redis:latest
+    container_name: redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis-data:/data
+
+networks:
+  default:
+    external: true
+    name: app-network
+
+volumes:
+  redis-data:

scripts/deploy.sh

@@ -5,15 +5,35 @@ cd /home/ubuntu/app
 
 # 환경변수 DOCKER_APP_NAME을 spring으로 설정
 DOCKER_APP_NAME=spring
-
 # 네트워크 존재 여부 확인 및 생성
 NETWORK_NAME="app-network"
+# redis container명
+REDIS_CONTAINER_NAME="redis"
 
 if ! sudo docker network ls | grep -q "$NETWORK_NAME"; then
     echo "Docker 네트워크가 없습니다. $NETWORK_NAME를 생성합니다."
     sudo docker network create $NETWORK_NAME
 fi
 
+# Redis 컨테이너가 실행 중인지 확인
+IS_REDIS_RUNNING=$(sudo docker ps --filter "name=${REDIS_CONTAINER_NAME}" --filter "status=running" -q)
+
+# Redis 컨테이너가 없거나 꺼져 있으면 redis-compose로 실행
+if [ -z "$IS_REDIS_RUNNING" ]; then
+    echo "Redis 실행 : $(date +%Y)-$(date +%m)-$(date +%d) $(date +%H):$(date +%M):$(date +%S)" >> /home/ubuntu/deploy.log
+    sudo docker-compose -f docker-compose.redis.yml up -d
+
+    # 재확인
+    sleep 3
+    IS_REDIS_RUNNING=$(sudo docker ps --filter "name=${REDIS_CONTAINER_NAME}" --filter "status=running" -q)
+    if [ -z "$IS_REDIS_RUNNING" ]; then
+        echo "배포 중단 - Redis 컨테이너 실행 실패 : $(date +%Y)-$(date +%m)-$(date +%d) $(date +%H):$(date +%M):$(date +%S)" >> /home/ubuntu/deploy.log
+        exit 1
+    fi
+fi
+
+echo "Redis 상태: $(sudo docker ps -a --filter name=redis --format '{{.Status}}')" >> /home/ubuntu/deploy.log
+
 # 실행중인 blue가 있는지 확인
 # 프로젝트의 실행 중인 컨테이너를 확인하고, 해당 컨테이너가 실행 중인지 여부를 EXIST_BLUE 변수에 저장
 EXIST_BLUE=$(sudo docker-compose -p ${DOCKER_APP_NAME}-blue -f docker-compose.blue.yml ps | grep Up)