diff --git a/README.md b/README.md index ddac717..f35cfd5 100644 --- a/README.md +++ b/README.md @@ -106,9 +106,9 @@ Run the following command： | MYSQL_SERVICE_PASSWORD | password of database | | | MYSQL_DATABASE_NUM | It indicates the number of database | default :**1** | | MYSQL_SERVICE_DB_PARAM | Database url parameter | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** | -| JVM_XMS | -Xms | default :2g | -| JVM_XMX | -Xmx | default :2g | -| JVM_XMN | -Xmn | default :1g | +| JVM_XMS | -Xms | default :1g | +| JVM_XMX | -Xmx | default :1g | +| JVM_XMN | -Xmn | default :512m | | JVM_MS | -XX:MetaspaceSize | default :128m | | JVM_MMS | -XX:MaxMetaspaceSize | default :320m | | NACOS_DEBUG | enable remote debug | y/n default :n | diff --git a/README_ZH.md b/README_ZH.md index 560e4a8..00e82f5 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -156,9 +156,9 @@ | MYSQL_SERVICE_PASSWORD | 数据库用户密码 | | | MYSQL_SERVICE_DB_PARAM | 数据库连接参数 | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** | | MYSQL_DATABASE_NUM | It indicates the number of database | 默认 :**1** | -| JVM_XMS | -Xms | 默认 :2g | -| JVM_XMX | -Xmx | 默认 :2g | -| JVM_XMN | -Xmn | 默认 :1g | +| JVM_XMS | -Xms | 默认 :1g | +| JVM_XMX | -Xmx | 默认 :1g | +| JVM_XMN | -Xmn | 默认 :512m | | JVM_MS | -XX:MetaspaceSize | 默认 :128m | | JVM_MMS | -XX:MaxMetaspaceSize | 默认 :320m | | NACOS_DEBUG | 是否开启远程DEBUG | y/n 默认 :n | diff --git a/build/Dockerfile b/build/Dockerfile index 8ee0c56..20fb24c 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -11,18 +11,18 @@ ENV MODE="cluster" \ JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk" \ NACOS_USER="nacos" \ JAVA="/usr/lib/jvm/java-1.8.0-openjdk/bin/java" \ - JVM_XMS="2g" \ - JVM_XMX="2g" \ - JVM_XMN="1g" \ + JVM_XMS="1g" \ + JVM_XMX="1g" \ + JVM_XMN="512m" \ JVM_MS="128m" \ JVM_MMS="320m" \ NACOS_DEBUG="n" \ TOMCAT_ACCESSLOG_ENABLED="false" \ TIME_ZONE="Asia/Shanghai" -ARG NACOS_VERSION=1.4.1 +ARG NACOS_VERSION=2.0.0 -WORKDIR /$BASE_DIR +WORKDIR $BASE_DIR RUN set -x \ && yum update -y \ diff --git a/example/.env b/example/.env new file mode 100644 index 0000000..8ae5db4 --- /dev/null +++ b/example/.env @@ -0,0 +1 @@ +NACOS_VERSION=2.0.0 \ No newline at end of file diff --git a/example/cluster-embedded.yaml b/example/cluster-embedded.yaml index a679eb8..4336cc4 100644 --- a/example/cluster-embedded.yaml +++ b/example/cluster-embedded.yaml @@ -3,7 +3,7 @@ services: nacos1: hostname: nacos1 container_name: nacos1 - image: nacos/nacos-server:1.4.1 + image: nacos/nacos-server:${NACOS_VERSION} volumes: - ./cluster-logs/nacos1:/home/nacos/logs - ./init.d/custom.properties:/home/nacos/init.d/custom.properties @@ -16,7 +16,7 @@ services: nacos2: hostname: nacos2 - image: nacos/nacos-server:1.4.1 + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos2 volumes: - ./cluster-logs/nacos2:/home/nacos/logs @@ -28,7 +28,7 @@ services: restart: always nacos3: hostname: nacos3 - image: nacos/nacos-server:1.4.1 + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos3 volumes: - ./cluster-logs/nacos3:/home/nacos/logs diff --git a/example/cluster-hostname.yaml b/example/cluster-hostname.yaml index df9a28d..82ac46d 100644 --- a/example/cluster-hostname.yaml +++ b/example/cluster-hostname.yaml @@ -3,7 +3,7 @@ services: nacos1: hostname: nacos1 container_name: nacos1 - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} volumes: - ./cluster-logs/nacos1:/home/nacos/logs - ./init.d/custom.properties:/home/nacos/init.d/custom.properties @@ -18,7 +18,7 @@ services: nacos2: hostname: nacos2 - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos2 volumes: - ./cluster-logs/nacos2:/home/nacos/logs @@ -32,7 +32,7 @@ services: - mysql nacos3: hostname: nacos3 - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos3 volumes: - ./cluster-logs/nacos3:/home/nacos/logs diff --git a/example/cluster-ip.yaml b/example/cluster-ip.yaml index 43ca9a5..d2f0509 100644 --- a/example/cluster-ip.yaml +++ b/example/cluster-ip.yaml @@ -1,7 +1,7 @@ version: "2" services: nacos1: - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos1 networks: nacos_net: @@ -18,7 +18,7 @@ services: - mysql nacos2: - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos2 networks: nacos_net: @@ -33,7 +33,7 @@ services: depends_on: - mysql nacos3: - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos3 networks: nacos_net: diff --git a/example/standalone-derby.yaml b/example/standalone-derby.yaml index 0d89236..bee496e 100644 --- a/example/standalone-derby.yaml +++ b/example/standalone-derby.yaml @@ -1,7 +1,7 @@ version: "2" services: nacos: - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos-standalone environment: - PREFER_HOST_MODE=hostname diff --git a/example/standalone-mysql-5.7.yaml b/example/standalone-mysql-5.7.yaml index 411562d..a27e616 100644 --- a/example/standalone-mysql-5.7.yaml +++ b/example/standalone-mysql-5.7.yaml @@ -1,7 +1,7 @@ version: "2" services: nacos: - image: nacos/nacos-server:latest + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos-standalone-mysql env_file: - ../env/nacos-standlone-mysql.env @@ -23,20 +23,20 @@ services: - ./mysql:/var/lib/mysql ports: - "3306:3306" - prometheus: - container_name: prometheus - image: prom/prometheus:latest - volumes: - - ./prometheus/prometheus-standalone.yaml:/etc/prometheus/prometheus.yml - ports: - - "9090:9090" - depends_on: - - nacos - restart: on-failure - grafana: - container_name: grafana - image: grafana/grafana:latest - ports: - - 3000:3000 - restart: on-failure +# prometheus: +# container_name: prometheus +# image: prom/prometheus:latest +# volumes: +# - ./prometheus/prometheus-standalone.yaml:/etc/prometheus/prometheus.yml +# ports: +# - "9090:9090" +# depends_on: +# - nacos +# restart: on-failure +# grafana: +# container_name: grafana +# image: grafana/grafana:latest +# ports: +# - 3000:3000 +# restart: on-failure diff --git a/example/standalone-mysql-8.yaml b/example/standalone-mysql-8.yaml index d0eb426..16bbe9d 100644 --- a/example/standalone-mysql-8.yaml +++ b/example/standalone-mysql-8.yaml @@ -1,7 +1,7 @@ version: "2" services: nacos: - image: nacos/nacos-server:1.4.0-BETA + image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos-standalone-mysql env_file: - ../env/nacos-standlone-mysql.env