diff --git a/nacos/2.3.1/docker-compose.yml b/nacos/2.3.1/docker-compose.yml index 3848a1233..bac188779 100644 --- a/nacos/2.3.1/docker-compose.yml +++ b/nacos/2.3.1/docker-compose.yml @@ -16,6 +16,9 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8848 - ${NACOS_COMMUNICATION_PORT}:9848 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs - ${NACOS_ROOT_PATH}/data:/home/nacos/data @@ -24,5 +27,3 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - env_file: - - .env diff --git a/nacos/2.3.1/scripts/init.sh b/nacos/2.3.1/scripts/init.sh index 88691a0f2..110cebce9 100644 --- a/nacos/2.3.1/scripts/init.sh +++ b/nacos/2.3.1/scripts/init.sh @@ -3,6 +3,10 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + if command -v mysql &> /dev/null; then if [[ -f ./init/mysql-schema.sql ]]; then mysql -u"$MYSQL_SERVICE_USER" -p"$MYSQL_SERVICE_PASSWORD" -h"$MYSQL_SERVICE_HOST" -P"$MYSQL_SERVICE_PORT" --protocol=TCP "$MYSQL_SERVICE_DB_NAME" < ./init/mysql-schema.sql diff --git a/nacos/2.3.1/scripts/upgrade.sh b/nacos/2.3.1/scripts/upgrade.sh index c86c4fbca..c211154a7 100644 --- a/nacos/2.3.1/scripts/upgrade.sh +++ b/nacos/2.3.1/scripts/upgrade.sh @@ -3,6 +3,10 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/nacos/data.yml b/nacos/data.yml index bdf915003..cb1c482bc 100644 --- a/nacos/data.yml +++ b/nacos/data.yml @@ -17,7 +17,6 @@ additionalProperties: type: website crossVersionUpdate: true limit: 0 - recommend: 0 website: https://nacos.io/ - github: https://github.com/alibaba/nacos - document: https://github.com/alibaba/nacos/blob/develop/README.md + github: https://github.com/alibaba/nacos/ + document: https://nacos.io/docs/latest/what-is-nacos/