diff --git a/docker-compose.yml b/docker-compose.yml index f206f55..9c63f33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,6 +17,19 @@ services: redis: condition: service_healthy + nginx: + image: nginx:latest + container_name: nginx + restart: always + ports: + - "80:80" + - "443:443" + volumes: + - ./nginx/conf.d:/etc/nginx/conf.d # 우리가 만든 default.conf 위치 + - /etc/letsencrypt:/etc/letsencrypt:ro # 인증서 마운트 (호스트 -> 컨테이너) + depends_on: + - my-server + mysql: image: mysql:latest environment: diff --git a/src/main/java/com/example/globalTimes_be/domain/trend/scheduler/TrendScheduler.java b/src/main/java/com/example/globalTimes_be/domain/trend/scheduler/TrendScheduler.java index 935125b..4dd9ed1 100644 --- a/src/main/java/com/example/globalTimes_be/domain/trend/scheduler/TrendScheduler.java +++ b/src/main/java/com/example/globalTimes_be/domain/trend/scheduler/TrendScheduler.java @@ -92,8 +92,8 @@ private List createTrendDTOS(String countryCode){ //반복문으로 items안에 있는 데이터 가져오기 for (Element item : items) { - // item을 6개 저장했으면 끝냄 - if(count > 5){ + // item을 6개 저장하거나 item이 비어있으면 종료 + if(count > 5 ){ break; }