From 7366ca04ad231bf7d0ad78dd62f3e10f7db91c6d Mon Sep 17 00:00:00 2001
From: doohaaa <engk5423@naver.com>
Date: Sun, 17 Aug 2025 17:03:32 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor(redis):=20aof=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?,=20cicd=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9C=84=ED=95=9C=20?=
 =?UTF-8?q?=EA=B8=B0=EC=A4=80=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cicd.yml              |  4 ++--
 database/docker-compose.yml             | 29 +++++++++++++++++++++++++
 docker-compose.yml                      |  2 ++
 src/main/resources/application-prod.yml |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 database/docker-compose.yml

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 2bacdef9..12b0e4e8 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -4,8 +4,8 @@ name: CI/CD Docker to EC2
 # 언제 이 워크플로우를 실행할지 정하는 부분임.
 on:
   push:
-    # "refactor/deployment" 브랜치에 코드가 push 될 때마다 실행될 거임.
-    branches: [ "refactor/deployment" ]
+    # "refactor/redis" 브랜치에 코드가 push 될 때마다 실행될 거임.
+    branches: [ "refactor/redis" ]
 
 # 워크플로우가 해야 할 작업(job)들을 정의함.
 jobs:
diff --git a/database/docker-compose.yml b/database/docker-compose.yml
new file mode 100644
index 00000000..8c6e90c5
--- /dev/null
+++ b/database/docker-compose.yml
@@ -0,0 +1,29 @@
+# db 용 docker-compose.yml
+
+version: '3.8'
+
+services:
+  redis:
+    # 사용할 이미지
+    image: redis:latest
+    # 컨테이너명
+    container_name: redis-container
+    # 접근 포트 설정(컨테이너 외부:컨테이너 내부)
+    ports:
+      - "6379:6379"
+    # 스토리지 마운트(볼륨) 설정
+    volumes:
+      - /home/ubuntu/db/redis/data:/data
+      - /home/ubuntu/db/redis/conf/redis.conf:/usr/local/conf/redis.conf
+    # 컨테이너에 docker label을 이용해서 메타데이터 추가
+    labels:
+      - "name=redis"
+      - "mode=standalone"
+    # 컨테이너 종료시 재시작 여부 설정
+    restart: always
+    command: redis-server /usr/local/conf/redis.conf
+
+networks:
+  default:
+    external: true
+    name: my-network
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 9fd5db50..31f7f3f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,8 @@ services:
     # application-prod.yml 파일을 활성화 시킴
     environment:
       SPRING_PROFILES_ACTIVE: prod
+      SPRING_REDIS_HOST: redis-container
+      SPRING_REDIS_PORT: 6379
     # docker 컨테이너가 중단되었을때 다시 자동으로 자동 재시작 하지 않음
     restart: "no"
     volumes:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 3a5c54a6..60e2c485 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -11,6 +11,7 @@ spring:
     redis:
       host: ${DEPLOY_REDIS_HOST}
       port: ${DEPLOY_REDIS_PORT}
+      password: ${DEPLOY_REDIS_PASSWORD}
       timeout: 3000
       ssl:
         enabled: true

From 3de09d1a0737cfd9d8d38164adce7bb92e668a79 Mon Sep 17 00:00:00 2001
From: doohaaa <engk5423@naver.com>
Date: Mon, 18 Aug 2025 09:27:34 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix(refactor/redis):=20=EC=9D=B8=EC=A6=9D?=
 =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-prod.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 60e2c485..3a5c54a6 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -11,7 +11,6 @@ spring:
     redis:
       host: ${DEPLOY_REDIS_HOST}
       port: ${DEPLOY_REDIS_PORT}
-      password: ${DEPLOY_REDIS_PASSWORD}
       timeout: 3000
       ssl:
         enabled: true