From 6f28cc3e17cf14309b93063358b38dc87248c597 Mon Sep 17 00:00:00 2001 From: pader Date: Thu, 20 Oct 2022 21:13:07 +0800 Subject: [PATCH] Release image of the Nacos 2.1.2 --- README.md | 2 +- build/Dockerfile | 4 +- build/Dockerfile.Slim | 2 +- env/custom-application-config.env | 3 + example/.env | 2 +- example/custom-application-config.yaml | 54 ++++++++ example/init.d/application.properties | 182 +++++++++++++++++++++++++ example/standalone-mysql-5.7.yaml | 20 +-- 8 files changed, 246 insertions(+), 23 deletions(-) create mode 100644 env/custom-application-config.env create mode 100644 example/custom-application-config.yaml create mode 100644 example/init.d/application.properties diff --git a/README.md b/README.md index 267913f..bf7ddc9 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ production environment. For example: ```docker -docker run --name nacos-standalone -e MODE=standalone -v /path/application.properties:/home/nacos/conf/application.properties -p 8848:8848 -d -p 9848:9848 nacos/nacos-server:2.1.1 +docker-compose -f example/custom-application-config.yaml up -d ``` ## Nacos + Grafana + Prometheus diff --git a/build/Dockerfile b/build/Dockerfile index 192304b..ae6ff9b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -20,14 +20,14 @@ ENV MODE="cluster" \ TOMCAT_ACCESSLOG_ENABLED="false" \ TIME_ZONE="Asia/Shanghai" -ARG NACOS_VERSION=2.1.1 +ARG NACOS_VERSION=2.1.2 ARG HOT_FIX_FLAG="" WORKDIR $BASE_DIR RUN set -x \ && yum update -y \ - && yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel wget iputils nc vim libcurl + && yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel wget iputils nc vim libcurl RUN wget https://github.com/alibaba/nacos/releases/download/${NACOS_VERSION}${HOT_FIX_FLAG}/nacos-server-${NACOS_VERSION}.tar.gz -P /home RUN tar -xzvf /home/nacos-server-${NACOS_VERSION}.tar.gz -C /home \ && rm -rf /home/nacos-server-${NACOS_VERSION}.tar.gz /home/nacos/bin/* /home/nacos/conf/*.properties /home/nacos/conf/*.example /home/nacos/conf/nacos-mysql.sql diff --git a/build/Dockerfile.Slim b/build/Dockerfile.Slim index c7d1965..4f6cf4d 100644 --- a/build/Dockerfile.Slim +++ b/build/Dockerfile.Slim @@ -1,6 +1,6 @@ FROM amd64/buildpack-deps:buster-curl as installer -ARG NACOS_VERSION=2.1.1 +ARG NACOS_VERSION=2.1.2常德 ARG HOT_FIX_FLAG="" RUN set -x \ diff --git a/env/custom-application-config.env b/env/custom-application-config.env new file mode 100644 index 0000000..64ca0b0 --- /dev/null +++ b/env/custom-application-config.env @@ -0,0 +1,3 @@ +PREFER_HOST_MODE=hostname +MODE=standalone +SPRING_DATASOURCE_PLATFORM=mysql \ No newline at end of file diff --git a/example/.env b/example/.env index d3a66ef..2893939 100644 --- a/example/.env +++ b/example/.env @@ -1 +1 @@ -NACOS_VERSION=v2.1.1 +NACOS_VERSION=2.1.2 diff --git a/example/custom-application-config.yaml b/example/custom-application-config.yaml new file mode 100644 index 0000000..4ad3af5 --- /dev/null +++ b/example/custom-application-config.yaml @@ -0,0 +1,54 @@ +version: "3.8" +services: + nacos: + image: nacos/nacos-server:${NACOS_VERSION} + container_name: nacos-standalone-mysql + env_file: + - ../env/nacos-standlone-mysql.env + volumes: + - ./standalone-logs/:/home/nacos/logs + ports: + - "8848:8848" + - "9848:9848" + - "9555:9555" + depends_on: + mysql: + condition: service_healthy + + restart: on-failure + mysql: + container_name: mysql + build: + context: . + dockerfile: ./image/mysql/5.7/Dockerfile + tags: + - "example/mysql:5.7" + image: example/mysql:5.7 + env_file: + - ../env/mysql.env + volumes: + - ./mysql:/var/lib/mysql + ports: + - "3306:3306" + healthcheck: + test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] + interval: 5s + timeout: 10s + retries: 10 +# 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/init.d/application.properties b/example/init.d/application.properties new file mode 100644 index 0000000..b9714c2 --- /dev/null +++ b/example/init.d/application.properties @@ -0,0 +1,182 @@ +# +# Copyright 1999-2021 Alibaba Group Holding Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#*************** Spring Boot Related Configurations ***************# +### Default web context path: +server.servlet.contextPath=/nacos +### Include message field +server.error.include-message=ALWAYS +### Default web server port: +server.port=8848 +#*************** Network Related Configurations ***************# +### If prefer hostname over ip for Nacos server addresses in cluster.conf: +# nacos.inetutils.prefer-hostname-over-ip=false +### Specify local server's IP: +# nacos.inetutils.ip-address= +#*************** Config Module Related Configurations ***************# +### If use MySQL as datasource: +spring.datasource.platform=mysql +### Count of DB: +db.num=1 +### Connect URL of DB: +db.url.0=jdbc:mysql://mysql:3306/nacos_devtest?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true +db.user.0=nacos +db.password.0=nacos +### Connection pool configuration: hikariCP +db.pool.config.connectionTimeout=30000 +db.pool.config.validationTimeout=10000 +db.pool.config.maximumPoolSize=20 +db.pool.config.minimumIdle=2 +#*************** Naming Module Related Configurations ***************# +### Data dispatch task execution period in milliseconds: Will removed on v2.1.X, replace with nacos.core.protocol.distro.data.sync.delayMs +# nacos.naming.distro.taskDispatchPeriod=200 +### Data count of batch sync task: Will removed on v2.1.X. Deprecated +# nacos.naming.distro.batchSyncKeyCount=1000 +### Retry delay in milliseconds if sync task failed: Will removed on v2.1.X, replace with nacos.core.protocol.distro.data.sync.retryDelayMs +# nacos.naming.distro.syncRetryDelay=5000 +### If enable data warmup. If set to false, the server would accept request without local data preparation: +# nacos.naming.data.warmup=true +### If enable the instance auto expiration, kind like of health check of instance: +# nacos.naming.expireInstance=true +### will be removed and replaced by `nacos.naming.clean` properties +nacos.naming.empty-service.auto-clean=true +nacos.naming.empty-service.clean.initial-delay-ms=50000 +nacos.naming.empty-service.clean.period-time-ms=30000 +### Add in 2.0.0 +### The interval to clean empty service, unit: milliseconds. +# nacos.naming.clean.empty-service.interval=60000 +### The expired time to clean empty service, unit: milliseconds. +# nacos.naming.clean.empty-service.expired-time=60000 +### The interval to clean expired metadata, unit: milliseconds. +# nacos.naming.clean.expired-metadata.interval=5000 +### The expired time to clean metadata, unit: milliseconds. +# nacos.naming.clean.expired-metadata.expired-time=60000 +### The delay time before push task to execute from service changed, unit: milliseconds. +# nacos.naming.push.pushTaskDelay=500 +### The timeout for push task execute, unit: milliseconds. +# nacos.naming.push.pushTaskTimeout=5000 +### The delay time for retrying failed push task, unit: milliseconds. +# nacos.naming.push.pushTaskRetryDelay=1000 +### Since 2.0.3 +### The expired time for inactive client, unit: milliseconds. +# nacos.naming.client.expired.time=180000 +#*************** CMDB Module Related Configurations ***************# +### The interval to dump external CMDB in seconds: +# nacos.cmdb.dumpTaskInterval=3600 +### The interval of polling data change event in seconds: +# nacos.cmdb.eventTaskInterval=10 +### The interval of loading labels in seconds: +# nacos.cmdb.labelTaskInterval=300 +### If turn on data loading task: +# nacos.cmdb.loadDataAtStart=false +#*************** Metrics Related Configurations ***************# +### Metrics for prometheus +#management.endpoints.web.exposure.include=* +### Metrics for elastic search +management.metrics.export.elastic.enabled=false +#management.metrics.export.elastic.host=http://localhost:9200 +### Metrics for influx +management.metrics.export.influx.enabled=false +#management.metrics.export.influx.db=springboot +#management.metrics.export.influx.uri=http://localhost:8086 +#management.metrics.export.influx.auto-create-db=true +#management.metrics.export.influx.consistency=one +#management.metrics.export.influx.compressed=true +#*************** Access Log Related Configurations ***************# +### If turn on the access log: +server.tomcat.accesslog.enabled=true +### The access log pattern: +server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i +### The directory of access log: +server.tomcat.basedir=file:. +#*************** Access Control Related Configurations ***************# +### If enable spring security, this option is deprecated in 1.2.0: +#spring.security.enabled=false +### The ignore urls of auth, is deprecated in 1.2.0: +nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** +### The auth system to use, currently only 'nacos' and 'ldap' is supported: +nacos.core.auth.system.type=nacos +### If turn on auth system: +nacos.core.auth.enabled=false +### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay. +nacos.core.auth.caching.enabled=true +### Since 1.4.1, Turn on/off white auth for user-agent: nacos-server, only for upgrade from old version. +nacos.core.auth.enable.userAgentAuthWhite=false +### Since 1.4.1, worked when nacos.core.auth.enabled=true and nacos.core.auth.enable.userAgentAuthWhite=false. +### The two properties is the white list for auth and used by identity the request from other server. +nacos.core.auth.server.identity.key=serverIdentity +nacos.core.auth.server.identity.value=security +### worked when nacos.core.auth.system.type=nacos +### The token expiration in seconds: +nacos.core.auth.plugin.nacos.token.expire.seconds=18000 +### The default token: +nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789 +### worked when nacos.core.auth.system.type=ldap?{0} is Placeholder,replace login username +#nacos.core.auth.ldap.url=ldap://localhost:389 +#nacos.core.auth.ldap.basedc=dc=example,dc=org +#nacos.core.auth.ldap.userDn=cn=admin,${nacos.core.auth.ldap.basedc} +#nacos.core.auth.ldap.password=admin +#nacos.core.auth.ldap.userdn=cn={0},dc=example,dc=org +#nacos.core.auth.ldap.filter.prefix=uid +#*************** Istio Related Configurations ***************# +### If turn on the MCP server: +nacos.istio.mcp.server.enabled=false +#*************** Core Related Configurations ***************# +### set the WorkerID manually +# nacos.core.snowflake.worker-id= +### Member-MetaData +# nacos.core.member.meta.site= +# nacos.core.member.meta.adweight= +# nacos.core.member.meta.weight= +### MemberLookup +### Addressing pattern category, If set, the priority is highest +# nacos.core.member.lookup.type=[file,address-server] +## Set the cluster list with a configuration file or command-line argument +# nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809 +## for AddressServerMemberLookup +# Maximum number of retries to query the address server upon initialization +# nacos.core.address-server.retry=5 +## Server domain name address of [address-server] mode +# address.server.domain=jmenv.tbsite.net +## Server port of [address-server] mode +# address.server.port=8080 +## Request address of [address-server] mode +# address.server.url=/nacos/serverlist +#*************** JRaft Related Configurations ***************# +### Sets the Raft cluster election timeout, default value is 5 second +# nacos.core.protocol.raft.data.election_timeout_ms=5000 +### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute +# nacos.core.protocol.raft.data.snapshot_interval_secs=30 +### raft internal worker threads +# nacos.core.protocol.raft.data.core_thread_num=8 +### Number of threads required for raft business request processing +# nacos.core.protocol.raft.data.cli_service_thread_num=4 +### raft linear read strategy. Safe linear reads are used by default, that is, the Leader tenure is confirmed by heartbeat +# nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe +### rpc request timeout, default 5 seconds +# nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000 +#*************** Distro Related Configurations ***************# +### Distro data sync delay time, when sync task delayed, task will be merged for same data key. Default 1 second. +# nacos.core.protocol.distro.data.sync.delayMs=1000 +### Distro data sync timeout for one sync data, default 3 seconds. +# nacos.core.protocol.distro.data.sync.timeoutMs=3000 +### Distro data sync retry delay time when sync data failed or timeout, same behavior with delayMs, default 3 seconds. +# nacos.core.protocol.distro.data.sync.retryDelayMs=3000 +### Distro data verify interval time, verify synced data whether expired for a interval. Default 5 seconds. +# nacos.core.protocol.distro.data.verify.intervalMs=5000 +### Distro data verify timeout for one verify, default 3 seconds. +# nacos.core.protocol.distro.data.verify.timeoutMs=3000 +### Distro data load retry delay when load snapshot data failed, default 30 seconds. +# nacos.core.protocol.distro.data.load.retryDelayMs=30000 \ No newline at end of file diff --git a/example/standalone-mysql-5.7.yaml b/example/standalone-mysql-5.7.yaml index 5176ec3..34e4bb7 100644 --- a/example/standalone-mysql-5.7.yaml +++ b/example/standalone-mysql-5.7.yaml @@ -4,10 +4,10 @@ services: image: nacos/nacos-server:${NACOS_VERSION} container_name: nacos-standalone-mysql env_file: - - ../env/nacos-standlone-mysql.env + - ../env/custom-application-config.env volumes: - ./standalone-logs/:/home/nacos/logs - - ./init.d/custom.properties:/home/nacos/init.d/custom.properties + - ./init.d/application.properties:/home/nacos/conf/application.properties ports: - "8848:8848" - "9848:9848" @@ -36,20 +36,4 @@ services: interval: 5s timeout: 10s retries: 10 -# 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