diff --git a/config/application.yml b/config/application.yml index 59ff97b..3a3e5bf 100644 --- a/config/application.yml +++ b/config/application.yml @@ -32,7 +32,7 @@ spring: username: guest password: guest zipkin: - base-url: http://${zipkin.hostname:${localhost}}:8085 + base-url: http://${zipkin.hostname:${localhost}}:9411 egov: message: hello \ No newline at end of file diff --git a/docker-compose/app/docker-compose.yml b/docker-compose/app/docker-compose.yml index fc94368..f6e6b12 100644 --- a/docker-compose/app/docker-compose.yml +++ b/docker-compose/app/docker-compose.yml @@ -1,16 +1,79 @@ version: '3' services: + rabbitmq: + container_name: rabbitmq + image: rabbitmq:management + ports: + - "5672:5672" + - "15672:15672" + restart: always + environment: + TZ: Asia/Seoul + + zipkin: + container_name: zipkin + image: openzipkin/zipkin + ports: + - "9411:9411" + restart: always + environment: + TZ: Asia/Seoul + + config: + container_name: config + image: egovframe/msa-edu-config:latest + ports: + - "8888:8888" + restart: always + volumes: + - ${HOME}/workspace.edu/egovframe-msa-edu/config:/usr/app/config # volume bind + environment: + ENCRYPT_KEY: token_secret + SPRING_PROFILES_ACTIVE: native + # logstash_hostname: logstash:5001 + RABBITMQ_HOSTNAME: rabbitmq + ZIPKIN_HOSTNAME: zipkin + TZ: Asia/Seoul + + discovery: + container_name: discovery + image: egovframe/msa-discovery:latest + ports: + - "8761:8761" + restart: always + environment: + SPRING_PROFILES_ACTIVE: default + EUREKA_INSTANCE_HOSTNAME: discovery + TZ: Asia/Seoul + + apigateway: + container_name: apigateway + image: egovframe/msa-apigateway:latest + ports: + - "8000:8000" + restart: on-failure + volumes: + - ${HOME}/workspace:/usr/app/msa-attach-volume + environment: + SPRING_CLOUD_CONFIG_URI: http://config:8888 + SPRING_PROFILES_ACTIVE: default + EUREKA_INSTANCE_HOSTNAME: discovery + RABBITMQ_HOSTNAME: rabbitmq + ZIPKIN_HOSTNAME: zipkin + APP_HOME: /usr/app + TZ: Asia/Seoul + userservice: container_name: userservice image: egovframe/msa-user-service:latest restart: always volumes: - - ${HOME}/workspace/docker-compose:/usr/app/msa-attach-volume + - ${HOME}/workspace.edu/docker-compose:/usr/app/msa-attach-volume environment: SPRING_CLOUD_CONFIG_URI: http://config:8888 SPRING_PROFILES_ACTIVE: default APP_HOME: /usr/app - logstash_hostname: logstash:5001 + # logstash_hostname: logstash:5001 EUREKA_INSTANCE_HOSTNAME: discovery MYSQL_HOSTNAME: mysql RABBITMQ_HOSTNAME: rabbitmq @@ -28,7 +91,7 @@ services: SPRING_PROFILES_ACTIVE: default EUREKA_INSTANCE_HOSTNAME: discovery APP_HOME: /usr/app - logstash_hostname: logstash:5001 + # logstash_hostname: logstash:5001 MYSQL_HOSTNAME: mysql TZ: Asia/Seoul @@ -43,7 +106,7 @@ services: SPRING_PROFILES_ACTIVE: default EUREKA_INSTANCE_HOSTNAME: discovery APP_HOME: /usr/app - logstash_hostname: logstash:5001 + # logstash_hostname: logstash:5001 MYSQL_HOSTNAME: mysql TZ: Asia/Seoul diff --git a/docker-compose/app/mesh/docker-compose.yml b/docker-compose/app/mesh/docker-compose.yml index df43144..29d6406 100644 --- a/docker-compose/app/mesh/docker-compose.yml +++ b/docker-compose/app/mesh/docker-compose.yml @@ -7,7 +7,7 @@ services: - "8888:8888" restart: always volumes: - - ${HOME}/workspace/egovframe-msa-edu/config:/usr/app/config # volume bind + - ${HOME}/workspace.edu/egovframe-msa-edu/config:/usr/app/config # volume bind environment: ENCRYPT_KEY: token_secret logstash_hostname: logstash:5001 @@ -59,7 +59,7 @@ services: container_name: zipkin image: openzipkin/zipkin ports: - - "8085:9411" + - "9411:9411" restart: always environment: TZ: Asia/Seoul diff --git a/docker-compose/app/service/docker-compose.yml b/docker-compose/app/service/docker-compose.yml new file mode 100644 index 0000000..1ab18b4 --- /dev/null +++ b/docker-compose/app/service/docker-compose.yml @@ -0,0 +1,53 @@ +version: '3' +services: + userservice: + container_name: userservice + image: egovframe/msa-user-service:latest + restart: always + volumes: + - ${HOME}/workspace:/usr/app/msa-attach-volume + environment: + SPRING_CLOUD_CONFIG_URI: http://config:8888 + SPRING_PROFILES_ACTIVE: default + APP_HOME: /usr/app + logstash_hostname: logstash:5001 + EUREKA_INSTANCE_HOSTNAME: discovery + MYSQL_HOSTNAME: mysql + RABBITMQ_HOSTNAME: rabbitmq + ZIPKIN_HOSTNAME: zipkin + TZ: Asia/Seoul + + boardservice: + container_name: boardservice + image: egovframe/msa-board-service:latest + restart: always + volumes: + - ${HOME}/workspace:/usr/app/msa-attach-volume + environment: + SPRING_CLOUD_CONFIG_URI: http://config:8888 + SPRING_PROFILES_ACTIVE: default + EUREKA_INSTANCE_HOSTNAME: discovery + APP_HOME: /usr/app + logstash_hostname: logstash:5001 + MYSQL_HOSTNAME: mysql + TZ: Asia/Seoul + + portalservice: + container_name: portalservice + image: egovframe/msa-portal-service:latest + restart: always + volumes: + - ${HOME}/workspace:/usr/app/msa-attach-volume + environment: + SPRING_CLOUD_CONFIG_URI: http://config:8888 + SPRING_PROFILES_ACTIVE: default + EUREKA_INSTANCE_HOSTNAME: discovery + APP_HOME: /usr/app + logstash_hostname: logstash:5001 + MYSQL_HOSTNAME: mysql + TZ: Asia/Seoul + +networks: + default: + external: + name: egov-network \ No newline at end of file diff --git a/docker-compose/elk/docker-compose.yml b/docker-compose/elk/docker-compose.yml index 016cddc..91b99cc 100644 --- a/docker-compose/elk/docker-compose.yml +++ b/docker-compose/elk/docker-compose.yml @@ -15,7 +15,7 @@ services: soft: -1 hard: -1 volumes: - - ${PWD}/data:/usr/share/elasticsearch/data + - ${HOME}/workspace.edu/data:/usr/share/elasticsearch/data logstash: container_name: logstash @@ -35,8 +35,6 @@ services: source: ${PWD}/logstash/pipeline target: /usr/share/logstash/pipeline read_only: true - depends_on: - - elasticsearch kibana: container_name: kibana @@ -53,8 +51,6 @@ services: source: ${PWD}/kibana/config/kibana.yml target: /usr/share/kibana/config/kibana.yml read_only: true - depends_on: - - elasticsearch networks: default: