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: 2 additions & 0 deletions .github/workflows/docker-multi-stage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 2 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -27,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:
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,6 +18,9 @@
@Configuration
public class RedisConfig {

@Value("${spring.data.redis.host}")
private String redisHost;

// 기본 RedisConnectionFactory
@Bean
@Primary
Expand All @@ -43,6 +47,7 @@ public RedisTemplate<String, Object> redisTemplate() {
@Bean
public RedisConnectionFactory notificationConnectionFactory() {
RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
config.setHostName(redisHost);
config.setDatabase(1);
return new LettuceConnectionFactory(config);
}
Expand All @@ -51,6 +56,7 @@ public RedisConnectionFactory notificationConnectionFactory() {
@Bean
public RedisConnectionFactory viewCountConnectionFactory() {
RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
config.setHostName(redisHost);
config.setDatabase(2);
return new LettuceConnectionFactory(config);
}
Expand All @@ -59,6 +65,7 @@ public RedisConnectionFactory viewCountConnectionFactory() {
@Bean
public RedisConnectionFactory refreshTokenConnectionFactory() {
RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
config.setHostName(redisHost);
config.setDatabase(3);
return new LettuceConnectionFactory(config);
}
Expand All @@ -67,6 +74,7 @@ public RedisConnectionFactory refreshTokenConnectionFactory() {
@Bean
public RedisConnectionFactory blacklistConnectionFactory() {
RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
config.setHostName(redisHost);
config.setDatabase(4);
return new LettuceConnectionFactory(config);
}
Expand Down Expand Up @@ -109,7 +117,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);
}
Expand Down
Loading