diff --git a/README.md b/README.md index 731f9af2a..7b053bd58 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,8 @@ | 🟢 | | MySQL | https://www.mysql.com/ | 关系数据库管理系统 | MySQL | | 🟢 | | MariaDB | https://mariadb.org/ | 【MySQL分支】创新的开源数据库 | MySQL | | 🟢 | | Percona | https://www.percona.com/ | 【MySQL分支】关系数据库管理系统 | MySQL | -| 🔴 | | Nacos | https://nacos.io/ | 动态服务发现、配置管理和服务管理平台 | | -| 🟢 | | NeZha | https://nacos.io/ | 【哪吒监控】开源、轻量、易用的服务器监控、运维工具 | | +| 🟢 | | Nacos | https://nacos.io/ | 动态服务发现、配置管理和服务管理平台 | | +| 🟢 | | NeZha | https://nezha.wiki/ | 【哪吒监控】开源、轻量、易用的服务器监控、运维工具 | | | 🟢 | | OneDev | https://onedev.io/ | DevOps 平台、带有 CI/CD、看板和软件包的 Git 服务器 | | | 🟢 | | OutLine | https://www.getoutline.com/ | 快速、协作的团队知识库 | | | 🟢 | | PostgreSQL | https://www.postgresql.org/ | 世界上最先进的开源关系数据库 | | diff --git a/apps/nacos/2.3.1/docker-compose.yml b/apps/nacos/2.3.1/docker-compose.yml index 3848a1233..bac188779 100644 --- a/apps/nacos/2.3.1/docker-compose.yml +++ b/apps/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/apps/nacos/2.3.1/scripts/init.sh b/apps/nacos/2.3.1/scripts/init.sh index 88691a0f2..110cebce9 100644 --- a/apps/nacos/2.3.1/scripts/init.sh +++ b/apps/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/apps/nacos/2.3.1/scripts/upgrade.sh b/apps/nacos/2.3.1/scripts/upgrade.sh index c86c4fbca..c211154a7 100644 --- a/apps/nacos/2.3.1/scripts/upgrade.sh +++ b/apps/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/apps/nacos/data.yml b/apps/nacos/data.yml index bdf915003..cb1c482bc 100644 --- a/apps/nacos/data.yml +++ b/apps/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/