diff --git a/appstore/baihu-panel/1.1.4/.env b/appstore/baihu-panel/1.1.5/.env similarity index 100% rename from appstore/baihu-panel/1.1.4/.env rename to appstore/baihu-panel/1.1.5/.env diff --git a/appstore/baihu-panel/1.1.4/data.yml b/appstore/baihu-panel/1.1.5/data.yml similarity index 100% rename from appstore/baihu-panel/1.1.4/data.yml rename to appstore/baihu-panel/1.1.5/data.yml diff --git a/appstore/baihu-panel/1.1.4/docker-compose.yml b/appstore/baihu-panel/1.1.5/docker-compose.yml similarity index 94% rename from appstore/baihu-panel/1.1.4/docker-compose.yml rename to appstore/baihu-panel/1.1.5/docker-compose.yml index 1b135d2b3..9f1996521 100644 --- a/appstore/baihu-panel/1.1.4/docker-compose.yml +++ b/appstore/baihu-panel/1.1.5/docker-compose.yml @@ -15,7 +15,7 @@ services: - BH_DB_PATH=/app/data/baihu.db - BH_DB_TABLE_PREFIX=baihu_ - BH_DB_NAME=baihu - image: ghcr.io/engigu/baihu:1.1.4 + image: ghcr.io/engigu/baihu:1.1.5 labels: createdBy: Apps logging: diff --git a/appstore/baihu-panel/1.1.4/envs/default.env b/appstore/baihu-panel/1.1.5/envs/default.env similarity index 100% rename from appstore/baihu-panel/1.1.4/envs/default.env rename to appstore/baihu-panel/1.1.5/envs/default.env diff --git a/appstore/baihu-panel/1.1.4/envs/global.env b/appstore/baihu-panel/1.1.5/envs/global.env similarity index 100% rename from appstore/baihu-panel/1.1.4/envs/global.env rename to appstore/baihu-panel/1.1.5/envs/global.env diff --git a/appstore/baihu-panel/1.1.4/scripts/init.sh b/appstore/baihu-panel/1.1.5/scripts/init.sh similarity index 100% rename from appstore/baihu-panel/1.1.4/scripts/init.sh rename to appstore/baihu-panel/1.1.5/scripts/init.sh diff --git a/appstore/baihu-panel/1.1.4/scripts/uninstall.sh b/appstore/baihu-panel/1.1.5/scripts/uninstall.sh similarity index 100% rename from appstore/baihu-panel/1.1.4/scripts/uninstall.sh rename to appstore/baihu-panel/1.1.5/scripts/uninstall.sh diff --git a/appstore/baihu-panel/1.1.4/scripts/upgrade.sh b/appstore/baihu-panel/1.1.5/scripts/upgrade.sh similarity index 100% rename from appstore/baihu-panel/1.1.4/scripts/upgrade.sh rename to appstore/baihu-panel/1.1.5/scripts/upgrade.sh diff --git a/appstore/nezha/2.0.13/.env b/appstore/nezha/2.0.14/.env similarity index 100% rename from appstore/nezha/2.0.13/.env rename to appstore/nezha/2.0.14/.env diff --git a/appstore/nezha/2.0.13/data.yml b/appstore/nezha/2.0.14/data.yml similarity index 100% rename from appstore/nezha/2.0.13/data.yml rename to appstore/nezha/2.0.14/data.yml diff --git a/appstore/nezha/2.0.13/data/config-example.yaml b/appstore/nezha/2.0.14/data/config-example.yaml similarity index 100% rename from appstore/nezha/2.0.13/data/config-example.yaml rename to appstore/nezha/2.0.14/data/config-example.yaml diff --git a/appstore/nezha/2.0.13/docker-compose.yml b/appstore/nezha/2.0.14/docker-compose.yml similarity index 88% rename from appstore/nezha/2.0.13/docker-compose.yml rename to appstore/nezha/2.0.14/docker-compose.yml index 65ffdb15a..d43d2d608 100644 --- a/appstore/nezha/2.0.13/docker-compose.yml +++ b/appstore/nezha/2.0.14/docker-compose.yml @@ -6,7 +6,7 @@ services: container_name: nezha environment: - TZ=Asia/Shanghai - image: ghcr.io/nezhahq/nezha:v2.0.13 + image: ghcr.io/nezhahq/nezha:v2.0.14 labels: createdBy: Apps networks: diff --git a/appstore/nezha/2.0.13/envs/default.env b/appstore/nezha/2.0.14/envs/default.env similarity index 100% rename from appstore/nezha/2.0.13/envs/default.env rename to appstore/nezha/2.0.14/envs/default.env diff --git a/appstore/nezha/2.0.13/envs/global.env b/appstore/nezha/2.0.14/envs/global.env similarity index 100% rename from appstore/nezha/2.0.13/envs/global.env rename to appstore/nezha/2.0.14/envs/global.env diff --git a/appstore/nezha/2.0.13/scripts/init.sh b/appstore/nezha/2.0.14/scripts/init.sh similarity index 100% rename from appstore/nezha/2.0.13/scripts/init.sh rename to appstore/nezha/2.0.14/scripts/init.sh diff --git a/appstore/nezha/2.0.13/scripts/uninstall.sh b/appstore/nezha/2.0.14/scripts/uninstall.sh similarity index 100% rename from appstore/nezha/2.0.13/scripts/uninstall.sh rename to appstore/nezha/2.0.14/scripts/uninstall.sh diff --git a/appstore/nezha/2.0.13/scripts/upgrade.sh b/appstore/nezha/2.0.14/scripts/upgrade.sh similarity index 100% rename from appstore/nezha/2.0.13/scripts/upgrade.sh rename to appstore/nezha/2.0.14/scripts/upgrade.sh diff --git a/appstore/qbittorrent/5.2.0/.env b/appstore/qbittorrent/5.2.1/.env similarity index 100% rename from appstore/qbittorrent/5.2.0/.env rename to appstore/qbittorrent/5.2.1/.env diff --git a/appstore/qbittorrent/5.2.0/data.yml b/appstore/qbittorrent/5.2.1/data.yml similarity index 100% rename from appstore/qbittorrent/5.2.0/data.yml rename to appstore/qbittorrent/5.2.1/data.yml diff --git a/dockge/qbittorrent_5_2_0/docker-compose.yml b/appstore/qbittorrent/5.2.1/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_2_0/docker-compose.yml rename to appstore/qbittorrent/5.2.1/docker-compose.yml index ef61c0272..232b5a7dc 100644 --- a/dockge/qbittorrent_5_2_0/docker-compose.yml +++ b/appstore/qbittorrent/5.2.1/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:5.2.0 + image: linuxserver/qbittorrent:5.2.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/qbittorrent/5.2.0/envs/default.env b/appstore/qbittorrent/5.2.1/envs/default.env similarity index 100% rename from appstore/qbittorrent/5.2.0/envs/default.env rename to appstore/qbittorrent/5.2.1/envs/default.env diff --git a/appstore/qbittorrent/5.2.0/envs/global.env b/appstore/qbittorrent/5.2.1/envs/global.env similarity index 100% rename from appstore/qbittorrent/5.2.0/envs/global.env rename to appstore/qbittorrent/5.2.1/envs/global.env diff --git a/appstore/qbittorrent/5.2.0/scripts/init.sh b/appstore/qbittorrent/5.2.1/scripts/init.sh similarity index 100% rename from appstore/qbittorrent/5.2.0/scripts/init.sh rename to appstore/qbittorrent/5.2.1/scripts/init.sh diff --git a/appstore/qbittorrent/5.2.0/scripts/uninstall.sh b/appstore/qbittorrent/5.2.1/scripts/uninstall.sh similarity index 100% rename from appstore/qbittorrent/5.2.0/scripts/uninstall.sh rename to appstore/qbittorrent/5.2.1/scripts/uninstall.sh diff --git a/appstore/qbittorrent/5.2.0/scripts/upgrade.sh b/appstore/qbittorrent/5.2.1/scripts/upgrade.sh similarity index 100% rename from appstore/qbittorrent/5.2.0/scripts/upgrade.sh rename to appstore/qbittorrent/5.2.1/scripts/upgrade.sh diff --git a/dockge/baihu-panel/docker-compose.yml b/dockge/baihu-panel/docker-compose.yml index 1b135d2b3..9f1996521 100644 --- a/dockge/baihu-panel/docker-compose.yml +++ b/dockge/baihu-panel/docker-compose.yml @@ -15,7 +15,7 @@ services: - BH_DB_PATH=/app/data/baihu.db - BH_DB_TABLE_PREFIX=baihu_ - BH_DB_NAME=baihu - image: ghcr.io/engigu/baihu:1.1.4 + image: ghcr.io/engigu/baihu:1.1.5 labels: createdBy: Apps logging: diff --git a/dockge/nezha/.env b/dockge/nezha/.env index cffbaa377..54509260f 100644 --- a/dockge/nezha/.env +++ b/dockge/nezha/.env @@ -4,3 +4,30 @@ NEZHA_ROOT_PATH=/home/nezha # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=8008 +# gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=5555 + +# OAuth 服务商 [必填] +OAUTH2_TYPE=github + +# 管理员账号ID [必填] +OAUTH2_ADMIN= + +# OAuth 客户端 ID [必填] +OAUTH2_CLIENTID= + +# OAuth 客户端 Secret [必填] +OAUTH2_CLIENTSECRET= + +# OAuth 端点 (可选) +OAUTH2_ENDPOINT= + +# 网站标题 [必填] +NZ_SITE_TITLE=哪吒监控 + +# Cookie 名称 (默认) [必填] +NZ_COOKIE_NAME=nezha-dashboard + +# 网站主题 (默认) [必填] +NZ_THEME=default + diff --git a/dockge/nezha/data/config-example.yaml b/dockge/nezha/data/config-example.yaml index f9d20745b..d063cf9f9 100644 --- a/dockge/nezha/data/config-example.yaml +++ b/dockge/nezha/data/config-example.yaml @@ -1,6 +1,33 @@ debug: false -listen_port: 8008 -language: zh_CN -site_name: "nz_site_title" -install_host: 127.0.0.1:8008 -tls: false +httpport: 80 +language: zh-CN +grpcport: nz_grpc_port +oauth2: + type: "nz_oauth2_type" + admin: "nz_admin_logins" + clientid: "nz_github_oauth_client_id" + clientsecret: "nz_github_oauth_client_secret" + endpoint: "" +site: + brand: "nz_site_title" + cookiename: "nezha-dashboard" + theme: "default" +ddns: + enable: false + provider: "webhook" + accessid: "" + accesssecret: "" + webhookmethod: "" + webhookurl: "" + webhookrequestbody: "" + webhookheaders: "" + maxretries: 3 + profiles: + example: + provider: "" + accessid: "" + accesssecret: "" + webhookmethod: "" + webhookurl: "" + webhookrequestbody: "" + webhookheaders: "" diff --git a/dockge/nezha/docker-compose.yml b/dockge/nezha/docker-compose.yml index 65ffdb15a..ff7b23dd8 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/docker-compose.yml @@ -2,17 +2,19 @@ networks: 1panel-network: external: true services: - nezha: + nezha-dashboard: container_name: nezha - environment: - - TZ=Asia/Shanghai - image: ghcr.io/nezhahq/nezha:v2.0.13 + image: ghcr.io/naiba/nezha-dashboard:v0.20.13 labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:8008 + - ${PANEL_APP_PORT_HTTP}:80 + - ${PANEL_APP_PORT_GRPC}:${PANEL_APP_PORT_GRPC} restart: always volumes: - ${NEZHA_ROOT_PATH}/data:/dashboard/data + - ${NEZHA_ROOT_PATH}/static-custom/static:/dashboard/resource/static/custom + - ${NEZHA_ROOT_PATH}/theme-custom/template:/dashboard/resource/template/theme-custom + - ${NEZHA_ROOT_PATH}/dashboard-custom/template:/dashboard/resource/template/dashboard-custom diff --git a/dockge/nezha_0_20_13/.env b/dockge/nezha_0_20_13/.env deleted file mode 100644 index 54509260f..000000000 --- a/dockge/nezha_0_20_13/.env +++ /dev/null @@ -1,33 +0,0 @@ -# 数据持久化路径 [必填] -NEZHA_ROOT_PATH=/home/nezha - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8008 - -# gRPC 端口 [必填] -PANEL_APP_PORT_GRPC=5555 - -# OAuth 服务商 [必填] -OAUTH2_TYPE=github - -# 管理员账号ID [必填] -OAUTH2_ADMIN= - -# OAuth 客户端 ID [必填] -OAUTH2_CLIENTID= - -# OAuth 客户端 Secret [必填] -OAUTH2_CLIENTSECRET= - -# OAuth 端点 (可选) -OAUTH2_ENDPOINT= - -# 网站标题 [必填] -NZ_SITE_TITLE=哪吒监控 - -# Cookie 名称 (默认) [必填] -NZ_COOKIE_NAME=nezha-dashboard - -# 网站主题 (默认) [必填] -NZ_THEME=default - diff --git a/dockge/nezha_0_20_13/data/config-example.yaml b/dockge/nezha_0_20_13/data/config-example.yaml deleted file mode 100644 index d063cf9f9..000000000 --- a/dockge/nezha_0_20_13/data/config-example.yaml +++ /dev/null @@ -1,33 +0,0 @@ -debug: false -httpport: 80 -language: zh-CN -grpcport: nz_grpc_port -oauth2: - type: "nz_oauth2_type" - admin: "nz_admin_logins" - clientid: "nz_github_oauth_client_id" - clientsecret: "nz_github_oauth_client_secret" - endpoint: "" -site: - brand: "nz_site_title" - cookiename: "nezha-dashboard" - theme: "default" -ddns: - enable: false - provider: "webhook" - accessid: "" - accesssecret: "" - webhookmethod: "" - webhookurl: "" - webhookrequestbody: "" - webhookheaders: "" - maxretries: 3 - profiles: - example: - provider: "" - accessid: "" - accesssecret: "" - webhookmethod: "" - webhookurl: "" - webhookrequestbody: "" - webhookheaders: "" diff --git a/dockge/nezha_0_20_13/docker-compose.yml b/dockge/nezha_0_20_13/docker-compose.yml deleted file mode 100644 index ff7b23dd8..000000000 --- a/dockge/nezha_0_20_13/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -networks: - 1panel-network: - external: true -services: - nezha-dashboard: - container_name: nezha - image: ghcr.io/naiba/nezha-dashboard:v0.20.13 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_GRPC}:${PANEL_APP_PORT_GRPC} - restart: always - volumes: - - ${NEZHA_ROOT_PATH}/data:/dashboard/data - - ${NEZHA_ROOT_PATH}/static-custom/static:/dashboard/resource/static/custom - - ${NEZHA_ROOT_PATH}/theme-custom/template:/dashboard/resource/template/theme-custom - - ${NEZHA_ROOT_PATH}/dashboard-custom/template:/dashboard/resource/template/dashboard-custom diff --git a/dockge/nezha_2_0_14/.env b/dockge/nezha_2_0_14/.env new file mode 100644 index 000000000..cffbaa377 --- /dev/null +++ b/dockge/nezha_2_0_14/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +NEZHA_ROOT_PATH=/home/nezha + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8008 + diff --git a/dockge/nezha_2_0_14/data/config-example.yaml b/dockge/nezha_2_0_14/data/config-example.yaml new file mode 100644 index 000000000..f9d20745b --- /dev/null +++ b/dockge/nezha_2_0_14/data/config-example.yaml @@ -0,0 +1,6 @@ +debug: false +listen_port: 8008 +language: zh_CN +site_name: "nz_site_title" +install_host: 127.0.0.1:8008 +tls: false diff --git a/dockge/nezha_2_0_14/docker-compose.yml b/dockge/nezha_2_0_14/docker-compose.yml new file mode 100644 index 000000000..d43d2d608 --- /dev/null +++ b/dockge/nezha_2_0_14/docker-compose.yml @@ -0,0 +1,18 @@ +networks: + 1panel-network: + external: true +services: + nezha: + container_name: nezha + environment: + - TZ=Asia/Shanghai + image: ghcr.io/nezhahq/nezha:v2.0.14 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:8008 + restart: always + volumes: + - ${NEZHA_ROOT_PATH}/data:/dashboard/data diff --git a/dockge/nezha_0_20_13/envs/default.env b/dockge/nezha_2_0_14/envs/default.env similarity index 100% rename from dockge/nezha_0_20_13/envs/default.env rename to dockge/nezha_2_0_14/envs/default.env diff --git a/dockge/nezha_0_20_13/envs/global.env b/dockge/nezha_2_0_14/envs/global.env similarity index 100% rename from dockge/nezha_0_20_13/envs/global.env rename to dockge/nezha_2_0_14/envs/global.env diff --git a/dockge/qbittorrent_5_2_0/.env b/dockge/qbittorrent_5_2_1/.env similarity index 100% rename from dockge/qbittorrent_5_2_0/.env rename to dockge/qbittorrent_5_2_1/.env diff --git a/appstore/qbittorrent/5.2.0/docker-compose.yml b/dockge/qbittorrent_5_2_1/docker-compose.yml similarity index 95% rename from appstore/qbittorrent/5.2.0/docker-compose.yml rename to dockge/qbittorrent_5_2_1/docker-compose.yml index ef61c0272..232b5a7dc 100644 --- a/appstore/qbittorrent/5.2.0/docker-compose.yml +++ b/dockge/qbittorrent_5_2_1/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:5.2.0 + image: linuxserver/qbittorrent:5.2.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_2_0/envs/default.env b/dockge/qbittorrent_5_2_1/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_2_0/envs/default.env rename to dockge/qbittorrent_5_2_1/envs/default.env diff --git a/dockge/qbittorrent_5_2_0/envs/global.env b/dockge/qbittorrent_5_2_1/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_2_0/envs/global.env rename to dockge/qbittorrent_5_2_1/envs/global.env