Release 2.0.0

This commit is contained in:
pader 2021-03-21 15:13:03 +08:00
parent 678b2a93f1
commit 4fb916ce88
10 changed files with 40 additions and 39 deletions

View File

@ -106,9 +106,9 @@ Run the following command
| MYSQL_SERVICE_PASSWORD | password of database | | | MYSQL_SERVICE_PASSWORD | password of database | |
| MYSQL_DATABASE_NUM | It indicates the number of database | default :**1** | | 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** | | MYSQL_SERVICE_DB_PARAM | Database url parameter | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** |
| JVM_XMS | -Xms | default :2g | | JVM_XMS | -Xms | default :1g |
| JVM_XMX | -Xmx | default :2g | | JVM_XMX | -Xmx | default :1g |
| JVM_XMN | -Xmn | default :1g | | JVM_XMN | -Xmn | default :512m |
| JVM_MS | -XX:MetaspaceSize | default :128m | | JVM_MS | -XX:MetaspaceSize | default :128m |
| JVM_MMS | -XX:MaxMetaspaceSize | default :320m | | JVM_MMS | -XX:MaxMetaspaceSize | default :320m |
| NACOS_DEBUG | enable remote debug | y/n default :n | | NACOS_DEBUG | enable remote debug | y/n default :n |

View File

@ -156,9 +156,9 @@
| MYSQL_SERVICE_PASSWORD | 数据库用户密码 | | | MYSQL_SERVICE_PASSWORD | 数据库用户密码 | |
| MYSQL_SERVICE_DB_PARAM | 数据库连接参数 | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** | | MYSQL_SERVICE_DB_PARAM | 数据库连接参数 | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** |
| MYSQL_DATABASE_NUM | It indicates the number of database | 默认 :**1** | | MYSQL_DATABASE_NUM | It indicates the number of database | 默认 :**1** |
| JVM_XMS | -Xms | 默认 :2g | | JVM_XMS | -Xms | 默认 :1g |
| JVM_XMX | -Xmx | 默认 :2g | | JVM_XMX | -Xmx | 默认 :1g |
| JVM_XMN | -Xmn | 默认 :1g | | JVM_XMN | -Xmn | 默认 :512m |
| JVM_MS | -XX:MetaspaceSize | 默认 :128m | | JVM_MS | -XX:MetaspaceSize | 默认 :128m |
| JVM_MMS | -XX:MaxMetaspaceSize | 默认 :320m | | JVM_MMS | -XX:MaxMetaspaceSize | 默认 :320m |
| NACOS_DEBUG | 是否开启远程DEBUG | y/n 默认 :n | | NACOS_DEBUG | 是否开启远程DEBUG | y/n 默认 :n |

View File

@ -11,18 +11,18 @@ ENV MODE="cluster" \
JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk" \ JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk" \
NACOS_USER="nacos" \ NACOS_USER="nacos" \
JAVA="/usr/lib/jvm/java-1.8.0-openjdk/bin/java" \ JAVA="/usr/lib/jvm/java-1.8.0-openjdk/bin/java" \
JVM_XMS="2g" \ JVM_XMS="1g" \
JVM_XMX="2g" \ JVM_XMX="1g" \
JVM_XMN="1g" \ JVM_XMN="512m" \
JVM_MS="128m" \ JVM_MS="128m" \
JVM_MMS="320m" \ JVM_MMS="320m" \
NACOS_DEBUG="n" \ NACOS_DEBUG="n" \
TOMCAT_ACCESSLOG_ENABLED="false" \ TOMCAT_ACCESSLOG_ENABLED="false" \
TIME_ZONE="Asia/Shanghai" 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 \ RUN set -x \
&& yum update -y \ && yum update -y \

1
example/.env Normal file
View File

@ -0,0 +1 @@
NACOS_VERSION=2.0.0

View File

@ -3,7 +3,7 @@ services:
nacos1: nacos1:
hostname: nacos1 hostname: nacos1
container_name: nacos1 container_name: nacos1
image: nacos/nacos-server:1.4.1 image: nacos/nacos-server:${NACOS_VERSION}
volumes: volumes:
- ./cluster-logs/nacos1:/home/nacos/logs - ./cluster-logs/nacos1:/home/nacos/logs
- ./init.d/custom.properties:/home/nacos/init.d/custom.properties - ./init.d/custom.properties:/home/nacos/init.d/custom.properties
@ -16,7 +16,7 @@ services:
nacos2: nacos2:
hostname: nacos2 hostname: nacos2
image: nacos/nacos-server:1.4.1 image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos2 container_name: nacos2
volumes: volumes:
- ./cluster-logs/nacos2:/home/nacos/logs - ./cluster-logs/nacos2:/home/nacos/logs
@ -28,7 +28,7 @@ services:
restart: always restart: always
nacos3: nacos3:
hostname: nacos3 hostname: nacos3
image: nacos/nacos-server:1.4.1 image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos3 container_name: nacos3
volumes: volumes:
- ./cluster-logs/nacos3:/home/nacos/logs - ./cluster-logs/nacos3:/home/nacos/logs

View File

@ -3,7 +3,7 @@ services:
nacos1: nacos1:
hostname: nacos1 hostname: nacos1
container_name: nacos1 container_name: nacos1
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
volumes: volumes:
- ./cluster-logs/nacos1:/home/nacos/logs - ./cluster-logs/nacos1:/home/nacos/logs
- ./init.d/custom.properties:/home/nacos/init.d/custom.properties - ./init.d/custom.properties:/home/nacos/init.d/custom.properties
@ -18,7 +18,7 @@ services:
nacos2: nacos2:
hostname: nacos2 hostname: nacos2
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos2 container_name: nacos2
volumes: volumes:
- ./cluster-logs/nacos2:/home/nacos/logs - ./cluster-logs/nacos2:/home/nacos/logs
@ -32,7 +32,7 @@ services:
- mysql - mysql
nacos3: nacos3:
hostname: nacos3 hostname: nacos3
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos3 container_name: nacos3
volumes: volumes:
- ./cluster-logs/nacos3:/home/nacos/logs - ./cluster-logs/nacos3:/home/nacos/logs

View File

@ -1,7 +1,7 @@
version: "2" version: "2"
services: services:
nacos1: nacos1:
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos1 container_name: nacos1
networks: networks:
nacos_net: nacos_net:
@ -18,7 +18,7 @@ services:
- mysql - mysql
nacos2: nacos2:
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos2 container_name: nacos2
networks: networks:
nacos_net: nacos_net:
@ -33,7 +33,7 @@ services:
depends_on: depends_on:
- mysql - mysql
nacos3: nacos3:
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos3 container_name: nacos3
networks: networks:
nacos_net: nacos_net:

View File

@ -1,7 +1,7 @@
version: "2" version: "2"
services: services:
nacos: nacos:
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos-standalone container_name: nacos-standalone
environment: environment:
- PREFER_HOST_MODE=hostname - PREFER_HOST_MODE=hostname

View File

@ -1,7 +1,7 @@
version: "2" version: "2"
services: services:
nacos: nacos:
image: nacos/nacos-server:latest image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos-standalone-mysql container_name: nacos-standalone-mysql
env_file: env_file:
- ../env/nacos-standlone-mysql.env - ../env/nacos-standlone-mysql.env
@ -23,20 +23,20 @@ services:
- ./mysql:/var/lib/mysql - ./mysql:/var/lib/mysql
ports: ports:
- "3306:3306" - "3306:3306"
prometheus: # prometheus:
container_name: prometheus # container_name: prometheus
image: prom/prometheus:latest # image: prom/prometheus:latest
volumes: # volumes:
- ./prometheus/prometheus-standalone.yaml:/etc/prometheus/prometheus.yml # - ./prometheus/prometheus-standalone.yaml:/etc/prometheus/prometheus.yml
ports: # ports:
- "9090:9090" # - "9090:9090"
depends_on: # depends_on:
- nacos # - nacos
restart: on-failure # restart: on-failure
grafana: # grafana:
container_name: grafana # container_name: grafana
image: grafana/grafana:latest # image: grafana/grafana:latest
ports: # ports:
- 3000:3000 # - 3000:3000
restart: on-failure # restart: on-failure

View File

@ -1,7 +1,7 @@
version: "2" version: "2"
services: services:
nacos: nacos:
image: nacos/nacos-server:1.4.0-BETA image: nacos/nacos-server:${NACOS_VERSION}
container_name: nacos-standalone-mysql container_name: nacos-standalone-mysql
env_file: env_file:
- ../env/nacos-standlone-mysql.env - ../env/nacos-standlone-mysql.env