diff --git a/docker-compose.yml b/docker-compose.yml index 0104608d..f95c915a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,20 +2,12 @@ version: '3' services: -# nginx: -# container_name: nginx -# image: nginx:latest -# ports: -# - "80:80" -# volumes: -# - /home/ec2-user/nginx.conf:/etc/nginx/nginx.conf -# depends_on: -# - "db" -# restart: always #항상 재실행 - api-gateway: container_name: api-gateway - image: ${DOCKERHUB_USERNAME}/waither-gateway + image: ${DOCKERHUB_USERNAME}/waither-gateway:latest + network_mode: host + depends_on: + - config ports: - "8000:8000" # restart: always @@ -26,13 +18,15 @@ services: config: container_name: config - image: ${DOCKERHUB_USERNAME}/waither-config + image: ${DOCKERHUB_USERNAME}/waither-config:latest + network_mode: host ports: - "8888:8888" + depends_on: + - eureka environment: CONFIG_GIT_URI : ${CONFIG_GIT_URI} CONFIG_PASSPHRASE : ${CONFIG_PASSPHRASE} -# CONFIG_PRIVATE_KEY : ${CONFIG_PRIVATE_KEY} # restart: always restart: no volumes: @@ -40,7 +34,8 @@ services: eureka: container_name: eureka - image: ${DOCKERHUB_USERNAME}/waither-eureka + image: ${DOCKERHUB_USERNAME}/waither-eureka:latest + network_mode: host ports: - "8761:8761" # restart: always @@ -50,7 +45,10 @@ services: user-service: container_name: user-service - image: ${DOCKERHUB_USERNAME}/waither-user + image: ${DOCKERHUB_USERNAME}/waither-user:latest + network_mode: host + depends_on: + - config ports: - "8080:8080" # restart: unless-stopped #수동으로 중지되지 않는 이상 항상 재실행 @@ -60,17 +58,23 @@ services: weather-service: container_name: weather-service - image: ${DOCKERHUB_USERNAME}/waither-weather + image: ${DOCKERHUB_USERNAME}/waither-weather:latest + network_mode: host + depends_on: + - config ports: - "8081:8081" # restart: unless-stopped restart: no volumes: - - /home/ec2-user/logs/weather-service:/logs + - /home/ec2-user/logs/weather-service:/logs:latest noti-service: container_name: noti-service - image: ${DOCKERHUB_USERNAME}/waither-noti + image: ${DOCKERHUB_USERNAME}/waither-noti:latest + network_mode: host + depends_on: + - config ports: - "8082:8082" # restart: unless-stopped diff --git a/noti-service/src/main/resources/bootstrap.yml b/noti-service/src/main/resources/bootstrap.yml index 1792b7ad..a3c81bb9 100644 --- a/noti-service/src/main/resources/bootstrap.yml +++ b/noti-service/src/main/resources/bootstrap.yml @@ -8,10 +8,10 @@ spring: active: dev cloud: config: - uri: http://config:8888 + uri: http://localhost:8888 name: database-noti,redis kafka: - bootstrap-servers: "kafka:9092" + bootstrap-servers: "localhost:9092" eureka: