diff --git a/appstore/casdoor/1.984.0/.env b/appstore/casdoor/1.985.0/.env similarity index 100% rename from appstore/casdoor/1.984.0/.env rename to appstore/casdoor/1.985.0/.env diff --git a/appstore/casdoor/1.984.0/config/init_data.json b/appstore/casdoor/1.985.0/config/init_data.json similarity index 100% rename from appstore/casdoor/1.984.0/config/init_data.json rename to appstore/casdoor/1.985.0/config/init_data.json diff --git a/appstore/casdoor/1.984.0/data.yml b/appstore/casdoor/1.985.0/data.yml similarity index 100% rename from appstore/casdoor/1.984.0/data.yml rename to appstore/casdoor/1.985.0/data.yml diff --git a/appstore/casdoor/1.984.0/docker-compose.yml b/appstore/casdoor/1.985.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/1.984.0/docker-compose.yml rename to appstore/casdoor/1.985.0/docker-compose.yml index db960784e..0af9d4f2b 100644 --- a/appstore/casdoor/1.984.0/docker-compose.yml +++ b/appstore/casdoor/1.985.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.984.0 + image: casbin/casdoor:v1.985.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/1.984.0/envs/casdoor.env b/appstore/casdoor/1.985.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/1.984.0/envs/casdoor.env rename to appstore/casdoor/1.985.0/envs/casdoor.env diff --git a/appstore/casdoor/1.984.0/envs/default.env b/appstore/casdoor/1.985.0/envs/default.env similarity index 100% rename from appstore/casdoor/1.984.0/envs/default.env rename to appstore/casdoor/1.985.0/envs/default.env diff --git a/appstore/casdoor/1.984.0/envs/global.env b/appstore/casdoor/1.985.0/envs/global.env similarity index 100% rename from appstore/casdoor/1.984.0/envs/global.env rename to appstore/casdoor/1.985.0/envs/global.env diff --git a/appstore/casdoor/1.984.0/scripts/init.sh b/appstore/casdoor/1.985.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/1.984.0/scripts/init.sh rename to appstore/casdoor/1.985.0/scripts/init.sh diff --git a/appstore/casdoor/1.984.0/scripts/uninstall.sh b/appstore/casdoor/1.985.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/1.984.0/scripts/uninstall.sh rename to appstore/casdoor/1.985.0/scripts/uninstall.sh diff --git a/appstore/casdoor/1.984.0/scripts/upgrade.sh b/appstore/casdoor/1.985.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/1.984.0/scripts/upgrade.sh rename to appstore/casdoor/1.985.0/scripts/upgrade.sh diff --git a/appstore/nezha-dash/2.9.7/.env b/appstore/nezha-dash/2.9.8/.env similarity index 100% rename from appstore/nezha-dash/2.9.7/.env rename to appstore/nezha-dash/2.9.8/.env diff --git a/appstore/nezha-dash/2.9.7/data.yml b/appstore/nezha-dash/2.9.8/data.yml similarity index 100% rename from appstore/nezha-dash/2.9.7/data.yml rename to appstore/nezha-dash/2.9.8/data.yml diff --git a/appstore/nezha-dash/2.9.7/docker-compose.yml b/appstore/nezha-dash/2.9.8/docker-compose.yml similarity index 94% rename from appstore/nezha-dash/2.9.7/docker-compose.yml rename to appstore/nezha-dash/2.9.8/docker-compose.yml index e0beb87a7..559b918b2 100644 --- a/appstore/nezha-dash/2.9.7/docker-compose.yml +++ b/appstore/nezha-dash/2.9.8/docker-compose.yml @@ -19,7 +19,7 @@ services: - NEXT_PUBLIC_CustomLogo=https://nezha-cf.buycoffee.top/apple-touch-icon.png - NEXT_PUBLIC_CustomTitle=NezhaDash - NEXT_PUBLIC_CustomDescription=NezhaDash is a dashboard for Nezha. - image: hamster1963/nezha-dash:v2.9.7 + image: hamster1963/nezha-dash:v2.9.8 labels: createdBy: Apps networks: diff --git a/appstore/nezha-dash/2.9.7/envs/default.env b/appstore/nezha-dash/2.9.8/envs/default.env similarity index 100% rename from appstore/nezha-dash/2.9.7/envs/default.env rename to appstore/nezha-dash/2.9.8/envs/default.env diff --git a/appstore/nezha-dash/2.9.7/envs/global.env b/appstore/nezha-dash/2.9.8/envs/global.env similarity index 100% rename from appstore/nezha-dash/2.9.7/envs/global.env rename to appstore/nezha-dash/2.9.8/envs/global.env diff --git a/appstore/nezha-dash/2.9.7/scripts/init.sh b/appstore/nezha-dash/2.9.8/scripts/init.sh similarity index 100% rename from appstore/nezha-dash/2.9.7/scripts/init.sh rename to appstore/nezha-dash/2.9.8/scripts/init.sh diff --git a/appstore/nezha-dash/2.9.7/scripts/uninstall.sh b/appstore/nezha-dash/2.9.8/scripts/uninstall.sh similarity index 100% rename from appstore/nezha-dash/2.9.7/scripts/uninstall.sh rename to appstore/nezha-dash/2.9.8/scripts/uninstall.sh diff --git a/appstore/nezha-dash/2.9.7/scripts/upgrade.sh b/appstore/nezha-dash/2.9.8/scripts/upgrade.sh similarity index 100% rename from appstore/nezha-dash/2.9.7/scripts/upgrade.sh rename to appstore/nezha-dash/2.9.8/scripts/upgrade.sh diff --git a/appstore/nezha/1.13.0/scripts/init.sh b/appstore/nezha/1.13.0/scripts/init.sh index 47a3bd837..07fb8c3fe 100644 --- a/appstore/nezha/1.13.0/scripts/init.sh +++ b/appstore/nezha/1.13.0/scripts/init.sh @@ -1,23 +1,14 @@ #!/bin/bash -if [[ -f .env ]]; then +if [ -f .env ]; then source .env - mkdir -p $NEZHA_ROOT_PATH - mkdir -p $NEZHA_ROOT_PATH/data - - cp -f ./data/config-example.yaml ./data/nezha-config.yaml - sed -i "s/grpcport: nz_grpc_port/grpcport: $PANEL_APP_PORT_GRPC/g" ./data/nezha-config.yaml - sed -i "s/type: \"nz_oauth2_type\"/type: \"$OAUTH2_TYPE\"/g" ./data/nezha-config.yaml - sed -i "s/admin: \"nz_admin_logins\"/admin: \"$OAUTH2_ADMIN\"/g" ./data/nezha-config.yaml - sed -i "s/clientid: \"nz_github_oauth_client_id\"/clientid: \"$OAUTH2_CLIENTID\"/g" ./data/nezha-config.yaml - sed -i "s/clientsecret: \"nz_github_oauth_client_secret\"/clientsecret: \"$OAUTH2_CLIENTSECRET\"/g" ./data/nezha-config.yaml - sed -i "s/endpoint: \"\"/endpoint: \"$OAUTH2_ENDPOINT\"/g" ./data/nezha-config.yaml - sed -i "s/brand: \"nz_site_title\"/brand: \"$NZ_SITE_TITLE\"/g" ./data/nezha-config.yaml - sed -i "s/cookiename: \"nezha-dashboard\"/cookiename: \"$NZ_COOKIE_NAME\"/g" ./data/nezha-config.yaml - sed -i "s/theme: \"default\"/theme: \"$NZ_THEME\"/g" ./data/nezha-config.yaml - cp -f ./data/nezha-config.yaml $NEZHA_ROOT_PATH/data/config.yaml - chmod -R 777 $NEZHA_ROOT_PATH + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/appstore/weblate/5.12.2.2/.env b/appstore/weblate/5.12.2.3/.env similarity index 100% rename from appstore/weblate/5.12.2.2/.env rename to appstore/weblate/5.12.2.3/.env diff --git a/appstore/weblate/5.12.2.2/data.yml b/appstore/weblate/5.12.2.3/data.yml similarity index 100% rename from appstore/weblate/5.12.2.2/data.yml rename to appstore/weblate/5.12.2.3/data.yml diff --git a/appstore/weblate/5.12.2.2/docker-compose.yml b/appstore/weblate/5.12.2.3/docker-compose.yml similarity index 94% rename from appstore/weblate/5.12.2.2/docker-compose.yml rename to appstore/weblate/5.12.2.3/docker-compose.yml index 234ece020..0ef1a8a39 100644 --- a/appstore/weblate/5.12.2.2/docker-compose.yml +++ b/appstore/weblate/5.12.2.3/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.12.2.2 + image: weblate/weblate:5.12.2.3 labels: createdBy: Apps networks: diff --git a/appstore/weblate/5.12.2.2/envs/default.env b/appstore/weblate/5.12.2.3/envs/default.env similarity index 100% rename from appstore/weblate/5.12.2.2/envs/default.env rename to appstore/weblate/5.12.2.3/envs/default.env diff --git a/appstore/weblate/5.12.2.2/envs/global.env b/appstore/weblate/5.12.2.3/envs/global.env similarity index 100% rename from appstore/weblate/5.12.2.2/envs/global.env rename to appstore/weblate/5.12.2.3/envs/global.env diff --git a/appstore/weblate/5.12.2.2/scripts/init.sh b/appstore/weblate/5.12.2.3/scripts/init.sh similarity index 100% rename from appstore/weblate/5.12.2.2/scripts/init.sh rename to appstore/weblate/5.12.2.3/scripts/init.sh diff --git a/appstore/weblate/5.12.2.2/scripts/uninstall.sh b/appstore/weblate/5.12.2.3/scripts/uninstall.sh similarity index 100% rename from appstore/weblate/5.12.2.2/scripts/uninstall.sh rename to appstore/weblate/5.12.2.3/scripts/uninstall.sh diff --git a/appstore/weblate/5.12.2.2/scripts/upgrade.sh b/appstore/weblate/5.12.2.3/scripts/upgrade.sh similarity index 100% rename from appstore/weblate/5.12.2.2/scripts/upgrade.sh rename to appstore/weblate/5.12.2.3/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index db960784e..0af9d4f2b 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.984.0 + image: casbin/casdoor:v1.985.0 labels: createdBy: Apps networks: diff --git a/dockge/nezha-dash/docker-compose.yml b/dockge/nezha-dash/docker-compose.yml index e0beb87a7..559b918b2 100644 --- a/dockge/nezha-dash/docker-compose.yml +++ b/dockge/nezha-dash/docker-compose.yml @@ -19,7 +19,7 @@ services: - NEXT_PUBLIC_CustomLogo=https://nezha-cf.buycoffee.top/apple-touch-icon.png - NEXT_PUBLIC_CustomTitle=NezhaDash - NEXT_PUBLIC_CustomDescription=NezhaDash is a dashboard for Nezha. - image: hamster1963/nezha-dash:v2.9.7 + image: hamster1963/nezha-dash:v2.9.8 labels: createdBy: Apps networks: diff --git a/dockge/weblate/docker-compose.yml b/dockge/weblate/docker-compose.yml index 234ece020..0ef1a8a39 100644 --- a/dockge/weblate/docker-compose.yml +++ b/dockge/weblate/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.12.2.2 + image: weblate/weblate:5.12.2.3 labels: createdBy: Apps networks: