From 854f22a15dc9c56e195f5fd84fb3b640672e7148 Mon Sep 17 00:00:00 2001 From: sumyeom Date: Fri, 7 Feb 2025 00:13:40 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-multi-stage-build.yml | 2 ++ docker-compose.yml | 2 ++ .../java/com/example/gamemate/global/config/RedisConfig.java | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/docker-multi-stage-build.yml b/.github/workflows/docker-multi-stage-build.yml index bec24df..1d7b783 100644 --- a/.github/workflows/docker-multi-stage-build.yml +++ b/.github/workflows/docker-multi-stage-build.yml @@ -66,6 +66,8 @@ jobs: echo "MYSQL_PROD_URL=${{ secrets.MYSQL_PROD_URL }}" >> .env echo "MYSQL_DEV_URL=${{ secrets.MYSQL_DEV_URL }}" >> .env echo "JPA_HIBERNATE_DDL=${{ secrets.JPA_HIBERNATE_DDL }}" >> .env + echo "JPA_HIBERNATE_DDL_PROD=${{ secrets.JPA_HIBERNATE_DDL_PROD }}" >> .env + echo "JPA_HIBERNATE_DDL_DEV=${{ secrets.JPA_HIBERNATE_DDL_DEV }}" >> .env echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env echo "AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }}" >> .env echo "AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}" >> .env diff --git a/docker-compose.yml b/docker-compose.yml index b2b4b6e..50b12b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,8 @@ services: MYSQL_PROD_URL: "${MYSQL_PROD_URL}" MYSQL_DEV_URL: "${MYSQL_DEV_URL}" JPA_HIBERNATE_DDL: "${JPA_HIBERNATE_DDL}" + JPA_HIBERNATE_DDL_PROD: "${JPA_HIBERNATE_DDL_PROD}" + JPA_HIBERNATE_DDL_DEV: "${JPA_HIBERNATE_DDL_DEV}" JWT_SECRET: "${JWT_SECRET}" AWS_ACCESS_KEY: "${AWS_ACCESS_KEY}" AWS_SECRET_KEY: "${AWS_SECRET_KEY}" diff --git a/src/main/java/com/example/gamemate/global/config/RedisConfig.java b/src/main/java/com/example/gamemate/global/config/RedisConfig.java index 63ab68a..3620f8b 100644 --- a/src/main/java/com/example/gamemate/global/config/RedisConfig.java +++ b/src/main/java/com/example/gamemate/global/config/RedisConfig.java @@ -3,6 +3,7 @@ import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -17,6 +18,9 @@ @Configuration public class RedisConfig { + @Value("${spring.data.redis.host}") + private String redisHost; + // 기본 RedisConnectionFactory @Bean @Primary From 4d8c82e65145682156003454d35540061f4b768c Mon Sep 17 00:00:00 2001 From: sumyeom Date: Fri, 7 Feb 2025 00:20:45 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/gamemate/global/config/RedisConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/gamemate/global/config/RedisConfig.java b/src/main/java/com/example/gamemate/global/config/RedisConfig.java index 3620f8b..139425d 100644 --- a/src/main/java/com/example/gamemate/global/config/RedisConfig.java +++ b/src/main/java/com/example/gamemate/global/config/RedisConfig.java @@ -113,7 +113,7 @@ public StringRedisTemplate blacklistRedisTemplate() { public RedissonClient redissonClient() { Config config = new Config(); config.useSingleServer() - .setAddress("redis://127.0.0.1:6379") + .setAddress("redis://" + redisHost + ":6379") .setDatabase(5); return Redisson.create(config); } From 16b8f45352a655738685082673cfaa3df15d9c5c Mon Sep 17 00:00:00 2001 From: sumyeom Date: Fri, 7 Feb 2025 08:47:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A1=9C=20=ED=98=B8=EC=8A=A4=ED=8A=B8=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 --- .../java/com/example/gamemate/global/config/RedisConfig.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/example/gamemate/global/config/RedisConfig.java b/src/main/java/com/example/gamemate/global/config/RedisConfig.java index 139425d..f7cfbd0 100644 --- a/src/main/java/com/example/gamemate/global/config/RedisConfig.java +++ b/src/main/java/com/example/gamemate/global/config/RedisConfig.java @@ -47,6 +47,7 @@ public RedisTemplate redisTemplate() { @Bean public RedisConnectionFactory notificationConnectionFactory() { RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + config.setHostName(redisHost); config.setDatabase(1); return new LettuceConnectionFactory(config); } @@ -55,6 +56,7 @@ public RedisConnectionFactory notificationConnectionFactory() { @Bean public RedisConnectionFactory viewCountConnectionFactory() { RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + config.setHostName(redisHost); config.setDatabase(2); return new LettuceConnectionFactory(config); } @@ -63,6 +65,7 @@ public RedisConnectionFactory viewCountConnectionFactory() { @Bean public RedisConnectionFactory refreshTokenConnectionFactory() { RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + config.setHostName(redisHost); config.setDatabase(3); return new LettuceConnectionFactory(config); } @@ -71,6 +74,7 @@ public RedisConnectionFactory refreshTokenConnectionFactory() { @Bean public RedisConnectionFactory blacklistConnectionFactory() { RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(); + config.setHostName(redisHost); config.setDatabase(4); return new LettuceConnectionFactory(config); } From 5e6a503e0a5ca6d05af1c9bc979e7fa0d044d69d Mon Sep 17 00:00:00 2001 From: sumyeom Date: Fri, 7 Feb 2025 10:47:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20RDS=20=EC=84=A4=EC=A0=95=ED=95=98?= =?UTF-8?q?=EC=97=AC=20docker-compose=EC=97=90=EC=84=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 50b12b8..09b0ea7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,19 +29,5 @@ services: GEMINI_URL: "${GEMINI_URL}" GEMINI_KEY: "${GEMINI_KEY}" REDIS_HOST: "${REDIS_HOST}" - depends_on: - - db - - db: - image: mysql:8.0 - container_name: db - environment: - MYSQL_ROOT_PASSWORD: "${MYSQL_PASSWORD}" - volumes: - - db-data:/var/lib/mysql - ports: - - "3306:3306" -volumes: - db-data: