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: 빌드 앤 푸시 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();