diff --git a/build/Dockerfile.Slim b/build/Dockerfile.Slim index ba31777..351cb9a 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.2 +ARG NACOS_VERSION=2.2.0 ARG HOT_FIX_FLAG="" RUN set -x \ diff --git a/build/conf/application.properties b/build/conf/application.properties index ac357a5..ec6619e 100644 --- a/build/conf/application.properties +++ b/build/conf/application.properties @@ -4,16 +4,21 @@ server.contextPath=/nacos server.port=${NACOS_APPLICATION_PORT:8848} server.tomcat.accesslog.max-days=30 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i -spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:""} +server.tomcat.accesslog.enabled=${TOMCAT_ACCESSLOG_ENABLED:false} +# default current work dir +server.tomcat.basedir=file:. +#*************** Config Module Related Configurations ***************# +### Deprecated configuration property, it is recommended to use `spring.sql.init.platform` replaced. +#spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:} +spring.sql.init.platform=${SPRING_DATASOURCE_PLATFORM:} nacos.cmdb.dumpTaskInterval=3600 nacos.cmdb.eventTaskInterval=10 nacos.cmdb.labelTaskInterval=300 nacos.cmdb.loadDataAtStart=false db.num=${MYSQL_DATABASE_NUM:1} db.url.0=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false} -db.url.1=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false} -db.user=${MYSQL_SERVICE_USER} -db.password=${MYSQL_SERVICE_PASSWORD} +db.user.0=${MYSQL_SERVICE_USER} +db.password.0=${MYSQL_SERVICE_PASSWORD} ### The auth system to use, currently only 'nacos' and 'ldap' is supported: nacos.core.auth.system.type=${NACOS_AUTH_SYSTEM_TYPE:nacos} ### worked when nacos.core.auth.system.type=nacos @@ -26,9 +31,6 @@ nacos.core.auth.caching.enabled=${NACOS_AUTH_CACHE_ENABLE:false} nacos.core.auth.enable.userAgentAuthWhite=${NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE:false} nacos.core.auth.server.identity.key=${NACOS_AUTH_IDENTITY_KEY:serverIdentity} nacos.core.auth.server.identity.value=${NACOS_AUTH_IDENTITY_VALUE:security} -server.tomcat.accesslog.enabled=${TOMCAT_ACCESSLOG_ENABLED:false} -# default current work dir -server.tomcat.basedir=file:. ## spring security config ### turn off security nacos.security.ignore.urls=${NACOS_SECURITY_IGNORE_URLS:/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**} diff --git a/example/init.d/application.properties b/example/init.d/application.properties index 27df57f..07f289e 100644 --- a/example/init.d/application.properties +++ b/example/init.d/application.properties @@ -27,9 +27,9 @@ server.port=8848 # nacos.inetutils.ip-address= #*************** Config Module Related Configurations ***************# ### Deprecated configuration property, it is recommended to use `spring.sql.init.platform` replaced. -# spring.datasource.platform=mysql +#spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:} +spring.sql.init.platform=${SPRING_DATASOURCE_PLATFORM:} # nacos.plugin.datasource.log.enabled=true -spring.sql.init.platform=mysql ### Count of DB: db.num=1 ### Connect URL of DB: @@ -43,7 +43,6 @@ db.pool.config.maximumPoolSize=20 db.pool.config.minimumIdle=2 #*************** Naming Module Related Configurations ***************# ### Data dispatch task execution period in milliseconds: - ### 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: @@ -134,7 +133,6 @@ nacos.core.auth.plugin.nacos.token.secret.key=SecretKey0123456789012345678901234 #*************** Istio Related Configurations ***************# ### If turn on the MCP server: nacos.istio.mcp.server.enabled=false - ###*************** Add from 1.3.0 ***************### #*************** Core Related Configurations ***************# ### set the WorkerID manually