Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 빌드 앤 푸시
Expand Down
14 changes: 14 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
9 changes: 9 additions & 0 deletions src/main/java/com/back/global/config/EmbeddedRedisConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down