From 95e7baa731be153cb02626ced0fdeb424a358eef Mon Sep 17 00:00:00 2001 From: zhanglong Date: Fri, 25 Oct 2019 20:51:45 +0800 Subject: [PATCH] Release 1.1.4 --- build/Dockerfile | 2 +- example/cluster-hostname.yaml | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 9c7477f..20d25a3 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -20,7 +20,7 @@ ENV MODE="cluster" \ TOMCAT_ACCESSLOG_ENABLED="false" \ TIME_ZONE="Asia/Shanghai" -ARG NACOS_VERSION=1.1.3 +ARG NACOS_VERSION=1.1.4 WORKDIR /$BASE_DIR diff --git a/example/cluster-hostname.yaml b/example/cluster-hostname.yaml index 2081994..4ea70e5 100644 --- a/example/cluster-hostname.yaml +++ b/example/cluster-hostname.yaml @@ -12,7 +12,7 @@ services: - "9555:9555" env_file: - ../env/nacos-hostname.env - restart: on-failure + restart: always depends_on: - mysql-master - mysql-slave @@ -28,7 +28,7 @@ services: - "8849:8848" env_file: - ../env/nacos-hostname.env - restart: on-failure + restart: always depends_on: - mysql-master - mysql-slave @@ -43,7 +43,7 @@ services: - "8850:8848" env_file: - ../env/nacos-hostname.env - restart: on-failure + restart: always depends_on: - mysql-master - mysql-slave @@ -69,21 +69,4 @@ services: - "3305:3306" depends_on: - mysql-master - prometheus: - container_name: prometheus - image: prom/prometheus:latest - volumes: - - ./prometheus/prometheus-cluster.yaml:/etc/prometheus/prometheus.yml - ports: - - "9090:9090" - depends_on: - - nacos1 - - nacos2 - - nacos3 - restart: on-failure - grafana: - container_name: grafana - image: grafana/grafana:latest - ports: - - 3000:3000 - restart: on-failure \ No newline at end of file +