From 29764531a8d41d8db81b3a1df0d03d4afae16f36 Mon Sep 17 00:00:00 2001 From: namgigun Date: Thu, 25 Sep 2025 14:19:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Chore:=20deploy.yml=20=EC=9D=BC=EB=B6=80=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - OWNER_LC 받는 방법 변경 ( 기존 : toLower({{ toLower(env.OWNER) }}) -> 변경: ${OWNER,,} ) --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d929ef98..2ce5999b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -60,7 +60,7 @@ jobs: - name: set lower case owner name run: | - echo "OWNER_LC=${{ toLower(env.OWNER) }}" >> ${GITHUB_ENV} + echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV} - name: 빌드 앤 푸시 From 9f1ee4627cb10fb1ed6a3e50c467b4cc54eced2d Mon Sep 17 00:00:00 2001 From: namgigun Date: Thu, 25 Sep 2025 16:32:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20Embedded=20Redis=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 사용자가 Mac 환경인 경우 embedded-redis를 건너뛰도록 - Docker-compose Redis 설정 추가 (Mac 유저가 Redis를 사용할 수 있도록) --- docker-compose.yml | 14 ++++++++++++++ .../back/global/config/EmbeddedRedisConfig.java | 9 +++++++++ 2 files changed, 23 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..f9b41937 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3.9" + +services: + redis: + image: redis:6.2 + container_name: local-redis + ports: + - "6379:6379" + volumes: + - redis_data:/data + command: ["redis-server", "--appendonly", "yes"] + +volumes: + redis_data: \ No newline at end of file diff --git a/src/main/java/com/back/global/config/EmbeddedRedisConfig.java b/src/main/java/com/back/global/config/EmbeddedRedisConfig.java index c569a4b8..16d15044 100644 --- a/src/main/java/com/back/global/config/EmbeddedRedisConfig.java +++ b/src/main/java/com/back/global/config/EmbeddedRedisConfig.java @@ -25,6 +25,15 @@ public class EmbeddedRedisConfig { @PostConstruct public void startRedis() { try { + String osName = System.getProperty("os.name").toLowerCase(); + + // Mac 환경이면 embedded-redis 건너뛰고 docker-compose Redis 사용 + if (osName.contains("mac")) { + System.out.println("Mac 환경 감지 → embedded-redis 비활성화, docker-compose Redis 사용"); + System.setProperty("spring.data.redis.port", "6379"); // docker-compose 기본 포트 + return; + } + this.port = findAvailablePort(); this.redisServer = new RedisServer(port); this.redisServer.start();