diff --git a/.github/workflows/depoly.yml b/.github/workflows/depoly.yml index cebdfc3c..a10e9d01 100644 --- a/.github/workflows/depoly.yml +++ b/.github/workflows/depoly.yml @@ -50,8 +50,6 @@ jobs: # # - name: Build with Gradle 8.5 # run: gradle build - - name: yml 파일확인 - run: ls - name: zip file 생성 run: | diff --git a/docker/docker-compose.blue.yml b/docker/docker-compose.blue.yml index 09db1c6f..d15e35ef 100644 --- a/docker/docker-compose.blue.yml +++ b/docker/docker-compose.blue.yml @@ -9,3 +9,5 @@ services: - "8081:8080" # 컨테이너의 이름 container_name: spring-blue + extra_hosts: + - "host.docker.internal:host-gateway" \ No newline at end of file diff --git a/docker/docker-compose.green.yml b/docker/docker-compose.green.yml index 05dc0d43..ca611e8f 100644 --- a/docker/docker-compose.green.yml +++ b/docker/docker-compose.green.yml @@ -5,13 +5,13 @@ services: ports: - "8082:8080" container_name: spring-green - + extra_hosts: + - "host.docker.internal:host-gateway" # 도커의 역할 # blue 8081 green 8082 # spring tomcat 8080 임 - # Nginx Docker # 80 -> 8082 -> 8080 \ No newline at end of file diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 4e99fdc9..d8ac3d0d 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -6,7 +6,6 @@ cd /home/ubuntu/app # 환경변수 DOCKER_APP_NAME을 spring으로 설정 DOCKER_APP_NAME=spring - # 실행중인 blue가 있는지 확인 # 프로젝트의 실행 중인 컨테이너를 확인하고, 해당 컨테이너가 실행 중인지 여부를 EXIST_BLUE 변수에 저장 EXIST_BLUE=$(sudo docker-compose -p ${DOCKER_APP_NAME}-blue -f docker-compose.blue.yml ps | grep Up) @@ -47,6 +46,7 @@ else echo "blue 중단 시작 : $(date +%Y)-$(date +%m)-$(date +%d) $(date +%H):$(date +%M):$(date +%S)" >> /home/ubuntu/deploy.log sudo docker-compose -p ${DOCKER_APP_NAME}-blue -f docker-compose.blue.yml down + sudo docker image prune -af echo "blue 중단 완료 : $(date +%Y)-$(date +%m)-$(date +%d) $(date +%H):$(date +%M):$(date +%S)" >> /home/ubuntu/deploy.log diff --git a/src/main/java/kr/KWGraduate/BookPharmacy/config/RedisConfig.java b/src/main/java/kr/KWGraduate/BookPharmacy/config/RedisConfig.java index c7e9728e..c652154f 100644 --- a/src/main/java/kr/KWGraduate/BookPharmacy/config/RedisConfig.java +++ b/src/main/java/kr/KWGraduate/BookPharmacy/config/RedisConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; @@ -12,12 +13,18 @@ public class RedisConfig { @Value("${spring.data.redis.host}") private String host; + @Value("${spring.data.redis.port}") private int port; + @Value("${spring.data.redis.password}") + private String password; + @Bean public RedisConnectionFactory redisConnectionFactory(){ - return new LettuceConnectionFactory(host,port); + RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(host, port); + config.setPassword(password); + return new LettuceConnectionFactory(config); } } diff --git a/submodule-config b/submodule-config index 7074d651..a2e03af3 160000 --- a/submodule-config +++ b/submodule-config @@ -1 +1 @@ -Subproject commit 7074d651a8b03a3f417ef128b32acb368850db6d +Subproject commit a2e03af3890fe10d32723c8c003c02ccb74d1387