From b1aec3df58c8030c1ea14bfaded530f04a9a0974 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 03:33:11 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/immich-machine-learning/1.136.0/.env | 21 --- .../immich-machine-learning/1.136.0/data.yml | 61 ------- .../1.136.0/docker-compose.yml | 22 --- .../{1.132.3 => 2.0.1}/.env | 0 .../{1.132.3 => 2.0.1}/data.yml | 0 .../{1.132.3 => 2.0.1}/docker-compose.yml | 4 +- .../{1.132.3 => 2.0.1}/envs/default.env | 0 .../{1.132.3 => 2.0.1}/envs/global.env | 0 .../{1.132.3 => 2.0.1}/scripts/init.sh | 0 .../{1.132.3 => 2.0.1}/scripts/uninstall.sh | 0 .../{1.132.3 => 2.0.1}/scripts/upgrade.sh | 0 appstore/immich-machine-learning/data.yml | 6 +- .../1.132.3/docker-compose.yml | 65 -------- appstore/immich-no-machine/1.136.0/.env | 42 ----- appstore/immich-no-machine/1.136.0/data.yml | 117 ------------- .../immich-no-machine/{1.132.3 => 2.0.1}/.env | 0 .../{1.132.3 => 2.0.1}/data.yml | 0 .../{1.136.0 => 2.0.1}/docker-compose.yml | 6 +- .../2.0.1}/envs/default.env | 0 .../2.0.1}/envs/global.env | 0 .../2.0.1}/scripts/init.sh | 0 .../2.0.1}/scripts/uninstall.sh | 0 .../2.0.1}/scripts/upgrade.sh | 0 appstore/immich-no-machine/data.yml | 4 +- .../immich-server/1.132.3/docker-compose.yml | 23 --- appstore/immich-server/1.136.0/.env | 48 ------ appstore/immich-server/1.136.0/data.yml | 138 ---------------- .../immich-server/1.136.0/docker-compose.yml | 23 --- .../immich-server/1.136.0/scripts/upgrade.sh | 17 -- .../immich-server/{1.132.3 => 2.0.1}/.env | 0 .../immich-server/{1.132.3 => 2.0.1}/data.yml | 0 .../immich-server/2.0.1}/docker-compose.yml | 6 +- .../2.0.1}/envs/default.env | 0 .../2.0.1}/envs/global.env | 0 .../2.0.1}/scripts/init.sh | 0 .../2.0.1}/scripts/uninstall.sh | 0 .../2.0.1}/scripts/upgrade.sh | 0 appstore/immich-server/data.yml | 6 +- appstore/immich/1.132.3/docker-compose.yml | 81 --------- appstore/immich/1.132.3/scripts/init.sh | 17 -- appstore/immich/1.132.3/scripts/uninstall.sh | 10 -- appstore/immich/1.132.3/scripts/upgrade.sh | 17 -- appstore/immich/1.136.0/.env | 54 ------ appstore/immich/1.136.0/data.yml | 156 ------------------ appstore/immich/1.136.0/docker-compose.yml | 58 ------- appstore/immich/1.136.0/envs/default.env | 2 - appstore/immich/1.136.0/envs/global.env | 2 - appstore/immich/1.136.0/scripts/init.sh | 17 -- appstore/immich/1.136.0/scripts/uninstall.sh | 10 -- appstore/immich/1.136.0/scripts/upgrade.sh | 17 -- appstore/immich/{1.132.3 => 2.0.1}/.env | 0 appstore/immich/{1.132.3 => 2.0.1}/data.yml | 0 .../immich/2.0.1}/docker-compose.yml | 12 +- .../1.136.0 => immich/2.0.1}/envs/default.env | 0 .../1.136.0 => immich/2.0.1}/envs/global.env | 0 .../1.136.0 => immich/2.0.1}/scripts/init.sh | 0 .../2.0.1}/scripts/uninstall.sh | 0 .../2.0.1}/scripts/upgrade.sh | 0 appstore/immich/data.yml | 4 +- appstore/nezha-dash/2.11.1/envs/default.env | 2 - appstore/nezha-dash/2.11.1/envs/global.env | 2 - appstore/nezha-dash/2.11.1/scripts/init.sh | 17 -- .../nezha-dash/2.11.1/scripts/uninstall.sh | 10 -- appstore/nezha-dash/2.11.1/scripts/upgrade.sh | 17 -- appstore/nezha-dash/{2.11.1 => 2.11.2}/.env | 0 .../nezha-dash/{2.11.1 => 2.11.2}/data.yml | 0 .../{2.11.1 => 2.11.2}/docker-compose.yml | 2 +- .../2.11.2}/envs/default.env | 0 .../2.11.2}/envs/global.env | 0 .../2.11.2}/scripts/init.sh | 0 .../2.11.2}/scripts/uninstall.sh | 0 .../2.11.2}/scripts/upgrade.sh | 0 appstore/nezha/1.14.3/docker-compose.yml | 19 --- appstore/nezha/1.14.3/envs/default.env | 2 - appstore/nezha/1.14.3/envs/global.env | 2 - appstore/nezha/1.14.3/scripts/init.sh | 17 -- appstore/nezha/1.14.3/scripts/uninstall.sh | 10 -- appstore/nezha/{1.14.3 => 1.14.5}/.env | 0 appstore/nezha/{1.14.3 => 1.14.5}/data.yml | 0 .../data/config-example.yaml | 0 .../nezha/1.14.5}/docker-compose.yml | 2 +- .../1.136.0 => nezha/1.14.5}/envs/default.env | 0 .../1.136.0 => nezha/1.14.5}/envs/global.env | 0 .../1.136.0 => nezha/1.14.5}/scripts/init.sh | 0 .../1.14.5}/scripts/uninstall.sh | 0 .../{1.14.3 => 1.14.5}/scripts/upgrade.sh | 0 .../docker-compose.yml | 4 +- dockge/immich-machine-learning_1_136_0/.env | 21 --- .../docker-compose.yml | 22 --- .../envs/default.env | 2 - .../envs/global.env | 2 - dockge/immich-no-machine/docker-compose.yml | 31 +--- dockge/immich-no-machine_1_136_0/.env | 42 ----- .../docker-compose.yml | 42 ----- .../envs/default.env | 2 - .../immich-no-machine_1_136_0/envs/global.env | 2 - dockge/immich-server/docker-compose.yml | 6 +- dockge/immich-server_1_136_0/.env | 48 ------ dockge/immich-server_1_136_0/envs/default.env | 2 - dockge/immich-server_1_136_0/envs/global.env | 2 - dockge/immich/docker-compose.yml | 35 +--- dockge/immich_1_136_0/.env | 54 ------ dockge/immich_1_136_0/envs/default.env | 2 - dockge/immich_1_136_0/envs/global.env | 2 - dockge/nezha-dash/docker-compose.yml | 2 +- dockge/nezha/.env | 35 ++-- dockge/nezha/data/config-example.yaml | 37 +---- dockge/nezha/docker-compose.yml | 13 +- dockge/nezha_0_20_13/.env | 33 ++++ dockge/nezha_0_20_13/data/config-example.yaml | 33 ++++ dockge/nezha_0_20_13/docker-compose.yml | 20 +++ .../nezha_0_20_13}/envs/default.env | 0 .../nezha_0_20_13}/envs/global.env | 0 dockge/nezha_1_14_3/.env | 42 ----- dockge/nezha_1_14_3/data/config-example.yaml | 6 - dockge/nezha_1_14_3/envs/default.env | 2 - dockge/nezha_1_14_3/envs/global.env | 2 - 117 files changed, 161 insertions(+), 1553 deletions(-) delete mode 100644 appstore/immich-machine-learning/1.136.0/.env delete mode 100644 appstore/immich-machine-learning/1.136.0/data.yml delete mode 100644 appstore/immich-machine-learning/1.136.0/docker-compose.yml rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/.env (100%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/data.yml (100%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/docker-compose.yml (74%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/envs/default.env (100%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/envs/global.env (100%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/scripts/init.sh (100%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/scripts/uninstall.sh (100%) rename appstore/immich-machine-learning/{1.132.3 => 2.0.1}/scripts/upgrade.sh (100%) delete mode 100644 appstore/immich-no-machine/1.132.3/docker-compose.yml delete mode 100644 appstore/immich-no-machine/1.136.0/.env delete mode 100644 appstore/immich-no-machine/1.136.0/data.yml rename appstore/immich-no-machine/{1.132.3 => 2.0.1}/.env (100%) rename appstore/immich-no-machine/{1.132.3 => 2.0.1}/data.yml (100%) rename appstore/immich-no-machine/{1.136.0 => 2.0.1}/docker-compose.yml (85%) rename appstore/{immich-machine-learning/1.136.0 => immich-no-machine/2.0.1}/envs/default.env (100%) rename appstore/{immich-machine-learning/1.136.0 => immich-no-machine/2.0.1}/envs/global.env (100%) rename appstore/{immich-machine-learning/1.136.0 => immich-no-machine/2.0.1}/scripts/init.sh (100%) rename appstore/{immich-machine-learning/1.136.0 => immich-no-machine/2.0.1}/scripts/uninstall.sh (100%) rename appstore/{immich-machine-learning/1.136.0 => immich-no-machine/2.0.1}/scripts/upgrade.sh (100%) delete mode 100644 appstore/immich-server/1.132.3/docker-compose.yml delete mode 100644 appstore/immich-server/1.136.0/.env delete mode 100644 appstore/immich-server/1.136.0/data.yml delete mode 100644 appstore/immich-server/1.136.0/docker-compose.yml delete mode 100644 appstore/immich-server/1.136.0/scripts/upgrade.sh rename appstore/immich-server/{1.132.3 => 2.0.1}/.env (100%) rename appstore/immich-server/{1.132.3 => 2.0.1}/data.yml (100%) rename {dockge/immich-server_1_136_0 => appstore/immich-server/2.0.1}/docker-compose.yml (69%) rename appstore/{immich-no-machine/1.132.3 => immich-server/2.0.1}/envs/default.env (100%) rename appstore/{immich-no-machine/1.132.3 => immich-server/2.0.1}/envs/global.env (100%) rename appstore/{immich-no-machine/1.132.3 => immich-server/2.0.1}/scripts/init.sh (100%) rename appstore/{immich-no-machine/1.132.3 => immich-server/2.0.1}/scripts/uninstall.sh (100%) rename appstore/{immich-no-machine/1.132.3 => immich-server/2.0.1}/scripts/upgrade.sh (100%) delete mode 100644 appstore/immich/1.132.3/docker-compose.yml delete mode 100644 appstore/immich/1.132.3/scripts/init.sh delete mode 100644 appstore/immich/1.132.3/scripts/uninstall.sh delete mode 100644 appstore/immich/1.132.3/scripts/upgrade.sh delete mode 100644 appstore/immich/1.136.0/.env delete mode 100644 appstore/immich/1.136.0/data.yml delete mode 100644 appstore/immich/1.136.0/docker-compose.yml delete mode 100644 appstore/immich/1.136.0/envs/default.env delete mode 100644 appstore/immich/1.136.0/envs/global.env delete mode 100644 appstore/immich/1.136.0/scripts/init.sh delete mode 100644 appstore/immich/1.136.0/scripts/uninstall.sh delete mode 100644 appstore/immich/1.136.0/scripts/upgrade.sh rename appstore/immich/{1.132.3 => 2.0.1}/.env (100%) rename appstore/immich/{1.132.3 => 2.0.1}/data.yml (100%) rename {dockge/immich_1_136_0 => appstore/immich/2.0.1}/docker-compose.yml (78%) rename appstore/{immich-no-machine/1.136.0 => immich/2.0.1}/envs/default.env (100%) rename appstore/{immich-no-machine/1.136.0 => immich/2.0.1}/envs/global.env (100%) rename appstore/{immich-no-machine/1.136.0 => immich/2.0.1}/scripts/init.sh (100%) rename appstore/{immich-no-machine/1.136.0 => immich/2.0.1}/scripts/uninstall.sh (100%) rename appstore/{immich-no-machine/1.136.0 => immich/2.0.1}/scripts/upgrade.sh (100%) delete mode 100644 appstore/nezha-dash/2.11.1/envs/default.env delete mode 100644 appstore/nezha-dash/2.11.1/envs/global.env delete mode 100644 appstore/nezha-dash/2.11.1/scripts/init.sh delete mode 100644 appstore/nezha-dash/2.11.1/scripts/uninstall.sh delete mode 100644 appstore/nezha-dash/2.11.1/scripts/upgrade.sh rename appstore/nezha-dash/{2.11.1 => 2.11.2}/.env (100%) rename appstore/nezha-dash/{2.11.1 => 2.11.2}/data.yml (100%) rename appstore/nezha-dash/{2.11.1 => 2.11.2}/docker-compose.yml (94%) rename appstore/{immich-server/1.132.3 => nezha-dash/2.11.2}/envs/default.env (100%) rename appstore/{immich-server/1.132.3 => nezha-dash/2.11.2}/envs/global.env (100%) rename appstore/{immich-server/1.132.3 => nezha-dash/2.11.2}/scripts/init.sh (100%) rename appstore/{immich-server/1.132.3 => nezha-dash/2.11.2}/scripts/uninstall.sh (100%) rename appstore/{immich-server/1.132.3 => nezha-dash/2.11.2}/scripts/upgrade.sh (100%) delete mode 100644 appstore/nezha/1.14.3/docker-compose.yml delete mode 100644 appstore/nezha/1.14.3/envs/default.env delete mode 100644 appstore/nezha/1.14.3/envs/global.env delete mode 100644 appstore/nezha/1.14.3/scripts/init.sh delete mode 100644 appstore/nezha/1.14.3/scripts/uninstall.sh rename appstore/nezha/{1.14.3 => 1.14.5}/.env (100%) rename appstore/nezha/{1.14.3 => 1.14.5}/data.yml (100%) rename appstore/nezha/{1.14.3 => 1.14.5}/data/config-example.yaml (100%) rename {dockge/nezha_1_14_3 => appstore/nezha/1.14.5}/docker-compose.yml (90%) rename appstore/{immich-server/1.136.0 => nezha/1.14.5}/envs/default.env (100%) rename appstore/{immich-server/1.136.0 => nezha/1.14.5}/envs/global.env (100%) rename appstore/{immich-server/1.136.0 => nezha/1.14.5}/scripts/init.sh (100%) rename appstore/{immich-server/1.136.0 => nezha/1.14.5}/scripts/uninstall.sh (100%) rename appstore/nezha/{1.14.3 => 1.14.5}/scripts/upgrade.sh (100%) delete mode 100644 dockge/immich-machine-learning_1_136_0/.env delete mode 100644 dockge/immich-machine-learning_1_136_0/docker-compose.yml delete mode 100644 dockge/immich-machine-learning_1_136_0/envs/default.env delete mode 100644 dockge/immich-machine-learning_1_136_0/envs/global.env delete mode 100644 dockge/immich-no-machine_1_136_0/.env delete mode 100644 dockge/immich-no-machine_1_136_0/docker-compose.yml delete mode 100644 dockge/immich-no-machine_1_136_0/envs/default.env delete mode 100644 dockge/immich-no-machine_1_136_0/envs/global.env delete mode 100644 dockge/immich-server_1_136_0/.env delete mode 100644 dockge/immich-server_1_136_0/envs/default.env delete mode 100644 dockge/immich-server_1_136_0/envs/global.env delete mode 100644 dockge/immich_1_136_0/.env delete mode 100644 dockge/immich_1_136_0/envs/default.env delete mode 100644 dockge/immich_1_136_0/envs/global.env create mode 100644 dockge/nezha_0_20_13/.env create mode 100644 dockge/nezha_0_20_13/data/config-example.yaml create mode 100644 dockge/nezha_0_20_13/docker-compose.yml rename {appstore/immich/1.132.3 => dockge/nezha_0_20_13}/envs/default.env (100%) rename {appstore/immich/1.132.3 => dockge/nezha_0_20_13}/envs/global.env (100%) delete mode 100644 dockge/nezha_1_14_3/.env delete mode 100644 dockge/nezha_1_14_3/data/config-example.yaml delete mode 100644 dockge/nezha_1_14_3/envs/default.env delete mode 100644 dockge/nezha_1_14_3/envs/global.env diff --git a/appstore/immich-machine-learning/1.136.0/.env b/appstore/immich-machine-learning/1.136.0/.env deleted file mode 100644 index 91116ad60..000000000 --- a/appstore/immich-machine-learning/1.136.0/.env +++ /dev/null @@ -1,21 +0,0 @@ -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-machine-learning - -# API 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 硬件驱动路径 [必填] -IMMICH_DRIVE_PATH=/dev/dri - -# 时区 [必填] -TZ=Asia/Shanghai - -# 机器学习 预加载模型 -MACHINE_LEARNING_PRELOAD__CLIP=XLM-Roberta-Large-Vit-B-16Plus - -# 人脸识别 预加载模型 -MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION=buffalo_l - -# Hugging Face 服务地址 -HF_ENDPOINT=https://hf-mirror.com - diff --git a/appstore/immich-machine-learning/1.136.0/data.yml b/appstore/immich-machine-learning/1.136.0/data.yml deleted file mode 100644 index 7321cde6d..000000000 --- a/appstore/immich-machine-learning/1.136.0/data.yml +++ /dev/null @@ -1,61 +0,0 @@ -additionalProperties: - formFields: - - default: "/home/immich-machine-learning" - edit: true - envKey: IMMICH_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 2283 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: API 端口 - labelEn: API port - required: true - rule: paramPort - type: number - - default: "/dev/dri" - edit: true - envKey: IMMICH_DRIVE_PATH - labelZh: 硬件驱动路径 - labelEn: Drive path - required: true - type: text - - default: "Asia/Shanghai" - edit: true - envKey: TZ - labelZh: 时区 - labelEn: Timezone - required: true - type: text - - default: "XLM-Roberta-Large-Vit-B-16Plus" - edit: true - envKey: MACHINE_LEARNING_PRELOAD__CLIP - labelEn: Machine Learning Preload Model - labelZh: 机器学习 预加载模型 - required: false - type: text - - default: "buffalo_l" - edit: true - envKey: MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION - labelEn: Machine Learning Preload Model - labelZh: 人脸识别 预加载模型 - required: false - type: select - values: - - label: antelopev2 - value: "antelopev2" - - label: buffalo_l - value: "buffalo_l" - - label: buffalo_m - value: "buffalo_m" - - label: buffalo_s - value: "buffalo_s" - - default: "https://hf-mirror.com" - edit: true - envKey: HF_ENDPOINT - labelZh: Hugging Face 服务地址 - labelEn: Hugging Face Endpoint - required: false - type: text diff --git a/appstore/immich-machine-learning/1.136.0/docker-compose.yml b/appstore/immich-machine-learning/1.136.0/docker-compose.yml deleted file mode 100644 index 7e51478d0..000000000 --- a/appstore/immich-machine-learning/1.136.0/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: immich-machine-learning -networks: - 1panel-network: - external: true -services: - immich-machine-learning: - container_name: immich-machine-learning-immich-machine-learning - devices: - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:3003 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/appstore/immich-machine-learning/1.132.3/.env b/appstore/immich-machine-learning/2.0.1/.env similarity index 100% rename from appstore/immich-machine-learning/1.132.3/.env rename to appstore/immich-machine-learning/2.0.1/.env diff --git a/appstore/immich-machine-learning/1.132.3/data.yml b/appstore/immich-machine-learning/2.0.1/data.yml similarity index 100% rename from appstore/immich-machine-learning/1.132.3/data.yml rename to appstore/immich-machine-learning/2.0.1/data.yml diff --git a/appstore/immich-machine-learning/1.132.3/docker-compose.yml b/appstore/immich-machine-learning/2.0.1/docker-compose.yml similarity index 74% rename from appstore/immich-machine-learning/1.132.3/docker-compose.yml rename to appstore/immich-machine-learning/2.0.1/docker-compose.yml index 0c0530ffe..c77f152ea 100644 --- a/appstore/immich-machine-learning/1.132.3/docker-compose.yml +++ b/appstore/immich-machine-learning/2.0.1/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-machine-learning: - container_name: immich-machine-learning-immich-machine-learning + container_name: immich-machine-learning devices: - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 labels: createdBy: Apps networks: diff --git a/appstore/immich-machine-learning/1.132.3/envs/default.env b/appstore/immich-machine-learning/2.0.1/envs/default.env similarity index 100% rename from appstore/immich-machine-learning/1.132.3/envs/default.env rename to appstore/immich-machine-learning/2.0.1/envs/default.env diff --git a/appstore/immich-machine-learning/1.132.3/envs/global.env b/appstore/immich-machine-learning/2.0.1/envs/global.env similarity index 100% rename from appstore/immich-machine-learning/1.132.3/envs/global.env rename to appstore/immich-machine-learning/2.0.1/envs/global.env diff --git a/appstore/immich-machine-learning/1.132.3/scripts/init.sh b/appstore/immich-machine-learning/2.0.1/scripts/init.sh similarity index 100% rename from appstore/immich-machine-learning/1.132.3/scripts/init.sh rename to appstore/immich-machine-learning/2.0.1/scripts/init.sh diff --git a/appstore/immich-machine-learning/1.132.3/scripts/uninstall.sh b/appstore/immich-machine-learning/2.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/immich-machine-learning/1.132.3/scripts/uninstall.sh rename to appstore/immich-machine-learning/2.0.1/scripts/uninstall.sh diff --git a/appstore/immich-machine-learning/1.132.3/scripts/upgrade.sh b/appstore/immich-machine-learning/2.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/immich-machine-learning/1.132.3/scripts/upgrade.sh rename to appstore/immich-machine-learning/2.0.1/scripts/upgrade.sh diff --git a/appstore/immich-machine-learning/data.yml b/appstore/immich-machine-learning/data.yml index 0a798c8f8..74aa335ad 100644 --- a/appstore/immich-machine-learning/data.yml +++ b/appstore/immich-machine-learning/data.yml @@ -7,8 +7,8 @@ shortDescZh: 高性能自托管照片和视频备份解决方案 shortDescEn: High performance self-hosted photo and video backup solution type: tool - crossVersionUpdate: true + crossVersionUpdate: false limit: 0 website: https://immich.app/ - github: https://github.com/immich-app/immich - document: https://immich.app/docs/overview/introduction + github: https://github.com/immich-app/immich/ + document: https://docs.immich.app/ diff --git a/appstore/immich-no-machine/1.132.3/docker-compose.yml b/appstore/immich-no-machine/1.132.3/docker-compose.yml deleted file mode 100644 index 0ad713e57..000000000 --- a/appstore/immich-no-machine/1.132.3/docker-compose.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: immich -networks: - 1panel-network: - external: true -services: - immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on - container_name: pg14-vectors-immich-no-machine - environment: - POSTGRES_DB: ${DB_DATABASE_NAME:-immich} - POSTGRES_INITDB_ARGS: --data-checksums - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_DB:-5432}:5432 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data - immich-server: - container_name: immich-server-immich-no-machine - depends_on: - - immich-pg14-vectors - devices: - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:2283 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - - /etc/localtime:/etc/localtime diff --git a/appstore/immich-no-machine/1.136.0/.env b/appstore/immich-no-machine/1.136.0/.env deleted file mode 100644 index da1ba0f59..000000000 --- a/appstore/immich-no-machine/1.136.0/.env +++ /dev/null @@ -1,42 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-app - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 数据库连接密码 [必填] -DB_PASSWORD= - -# 数据库 端口 [必填] -PANEL_APP_PORT_DB=5432 - -# 数据库 主机地址 [必填] -DB_HOSTNAME=immich-pg14-vectors - -# 数据库 用户名 [必填] -DB_USERNAME=postgres - -# 数据库 名称 [必填] -DB_DATABASE_NAME=immich - -# Redis 主机 [必填] -REDIS_HOSTNAME=127.0.0.1 - -# Redis 端口 [必填] -REDIS_PORT=6379 - -# Redis 索引 [必填] -REDIS_DBINDEX=0 - -# Redis 用户名 -REDIS_USERNAME= - -# Redis 密码 -REDIS_PASSWORD= - -# 是否跳过目录检查 -IMMICH_IGNORE_MOUNT_CHECK_ERRORS=false - diff --git a/appstore/immich-no-machine/1.136.0/data.yml b/appstore/immich-no-machine/1.136.0/data.yml deleted file mode 100644 index 093e32b15..000000000 --- a/appstore/immich-no-machine/1.136.0/data.yml +++ /dev/null @@ -1,117 +0,0 @@ -additionalProperties: - formFields: - - child: - default: "" - envKey: PANEL_REDIS_SERVICE - required: true - type: service - default: redis - envKey: PANEL_REDIS_TYPE - labelZh: Redis 服务 (前置检查) - labelEn: Redis Service (Pre-check) - required: true - type: apps - values: - - label: Redis - value: redis - - default: "/home/immich-app" - edit: true - envKey: IMMICH_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 2283 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "" - edit: true - envKey: DB_PASSWORD - labelEn: Database Password - labelZh: 数据库连接密码 - random: true - required: true - rule: paramComplexity - type: password - - default: 5432 - edit: true - envKey: PANEL_APP_PORT_DB - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "immich-pg14-vectors" - disabled: true - envKey: DB_HOSTNAME - labelZh: 数据库 主机地址 - labelEn: Database Host - required: true - type: text - - default: "postgres" - disabled: true - envKey: DB_USERNAME - labelZh: 数据库 用户名 - labelEn: Database User - required: true - type: text - - default: "immich" - disabled: true - envKey: DB_DATABASE_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: REDIS_HOSTNAME - labelZh: Redis 主机 - labelEn: Redis Host - required: true - type: text - - default: 6379 - edit: true - envKey: REDIS_PORT - labelZh: Redis 端口 - labelEn: Redis Port - required: true - rule: paramPort - type: number - - default: 0 - edit: true - envKey: REDIS_DBINDEX - labelZh: Redis 索引 - labelEn: Redis Index - required: true - type: number - - default: "" - edit: true - envKey: REDIS_USERNAME - labelZh: Redis 用户名 - labelEn: Redis Username - required: false - type: text - - default: "" - edit: true - envKey: REDIS_PASSWORD - labelZh: Redis 密码 - labelEn: Redis Password - required: false - type: password - - default: "false" - edit: true - envKey: IMMICH_IGNORE_MOUNT_CHECK_ERRORS - labelZh: 是否跳过目录检查 - labelEn: Skip Mount Check - required: false - type: select - values: - - label: 跳过检查 - value: "true" - - label: 不跳过检查 - value: "false" diff --git a/appstore/immich-no-machine/1.132.3/.env b/appstore/immich-no-machine/2.0.1/.env similarity index 100% rename from appstore/immich-no-machine/1.132.3/.env rename to appstore/immich-no-machine/2.0.1/.env diff --git a/appstore/immich-no-machine/1.132.3/data.yml b/appstore/immich-no-machine/2.0.1/data.yml similarity index 100% rename from appstore/immich-no-machine/1.132.3/data.yml rename to appstore/immich-no-machine/2.0.1/data.yml diff --git a/appstore/immich-no-machine/1.136.0/docker-compose.yml b/appstore/immich-no-machine/2.0.1/docker-compose.yml similarity index 85% rename from appstore/immich-no-machine/1.136.0/docker-compose.yml rename to appstore/immich-no-machine/2.0.1/docker-compose.yml index f953ba274..f845557b2 100644 --- a/appstore/immich-no-machine/1.136.0/docker-compose.yml +++ b/appstore/immich-no-machine/2.0.1/docker-compose.yml @@ -21,7 +21,7 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data immich-server: - container_name: immich-server-immich-no-machine + container_name: immich-no-machine depends_on: - immich-pg14-vectors devices: @@ -29,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 + image: ghcr.io/immich-app/immich-server:v2.0.1 labels: createdBy: Apps networks: @@ -38,5 +38,5 @@ services: - ${PANEL_APP_PORT_HTTP}:2283 restart: always volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload + - ${IMMICH_ROOT_PATH}/data/library:/data - /etc/localtime:/etc/localtime diff --git a/appstore/immich-machine-learning/1.136.0/envs/default.env b/appstore/immich-no-machine/2.0.1/envs/default.env similarity index 100% rename from appstore/immich-machine-learning/1.136.0/envs/default.env rename to appstore/immich-no-machine/2.0.1/envs/default.env diff --git a/appstore/immich-machine-learning/1.136.0/envs/global.env b/appstore/immich-no-machine/2.0.1/envs/global.env similarity index 100% rename from appstore/immich-machine-learning/1.136.0/envs/global.env rename to appstore/immich-no-machine/2.0.1/envs/global.env diff --git a/appstore/immich-machine-learning/1.136.0/scripts/init.sh b/appstore/immich-no-machine/2.0.1/scripts/init.sh similarity index 100% rename from appstore/immich-machine-learning/1.136.0/scripts/init.sh rename to appstore/immich-no-machine/2.0.1/scripts/init.sh diff --git a/appstore/immich-machine-learning/1.136.0/scripts/uninstall.sh b/appstore/immich-no-machine/2.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/immich-machine-learning/1.136.0/scripts/uninstall.sh rename to appstore/immich-no-machine/2.0.1/scripts/uninstall.sh diff --git a/appstore/immich-machine-learning/1.136.0/scripts/upgrade.sh b/appstore/immich-no-machine/2.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/immich-machine-learning/1.136.0/scripts/upgrade.sh rename to appstore/immich-no-machine/2.0.1/scripts/upgrade.sh diff --git a/appstore/immich-no-machine/data.yml b/appstore/immich-no-machine/data.yml index 65d883be7..21160fdf9 100644 --- a/appstore/immich-no-machine/data.yml +++ b/appstore/immich-no-machine/data.yml @@ -9,8 +9,8 @@ shortDescZh: 高性能自托管照片和视频备份解决方案 shortDescEn: High performance self-hosted photo and video backup solution type: website - crossVersionUpdate: true + crossVersionUpdate: false limit: 0 website: https://immich.app/ github: https://github.com/immich-app/immich/ - document: https://immich.app/docs/overview/introduction/ + document: https://docs.immich.app/ diff --git a/appstore/immich-server/1.132.3/docker-compose.yml b/appstore/immich-server/1.132.3/docker-compose.yml deleted file mode 100644 index 1f7695a07..000000000 --- a/appstore/immich-server/1.132.3/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: immich-server -networks: - 1panel-network: - external: true -services: - immich-server: - container_name: immich-server-immich-server - devices: - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:2283 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - - /etc/localtime:/etc/localtime diff --git a/appstore/immich-server/1.136.0/.env b/appstore/immich-server/1.136.0/.env deleted file mode 100644 index 27aea5506..000000000 --- a/appstore/immich-server/1.136.0/.env +++ /dev/null @@ -1,48 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# Postgres 服务 (前置检查) [必填] -PANEL_POSTGRES_TYPE=postgresql - -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-app - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 时区 [必填] -TZ=Asia/Shanghai - -# 数据库 主机地址 [必填] -DB_HOSTNAME=127.0.0.1 - -# 数据库 端口 [必填] -DB_PORT=5432 - -# 数据库 用户名 [必填] -DB_USERNAME=postgres - -# 数据库 密码 [必填] -DB_PASSWORD= - -# 数据库 名称 [必填] -DB_DATABASE_NAME=immich - -# Redis 主机 [必填] -REDIS_HOSTNAME=127.0.0.1 - -# Redis 端口 [必填] -REDIS_PORT=6379 - -# Redis 索引 [必填] -REDIS_DBINDEX=0 - -# Redis 用户名 -REDIS_USERNAME= - -# Redis 密码 -REDIS_PASSWORD= - -# 是否跳过目录检查 -IMMICH_IGNORE_MOUNT_CHECK_ERRORS=false - diff --git a/appstore/immich-server/1.136.0/data.yml b/appstore/immich-server/1.136.0/data.yml deleted file mode 100644 index 33b62351b..000000000 --- a/appstore/immich-server/1.136.0/data.yml +++ /dev/null @@ -1,138 +0,0 @@ -additionalProperties: - formFields: - - child: - default: "" - envKey: PANEL_REDIS_SERVICE - required: true - type: service - default: redis - envKey: PANEL_REDIS_TYPE - labelZh: Redis 服务 (前置检查) - labelEn: Redis Service (Pre-check) - required: true - type: apps - values: - - label: Redis - value: redis - - child: - default: "" - envKey: PANEL_POSTGRES_SERVICE - required: true - type: service - default: postgresql - envKey: PANEL_POSTGRES_TYPE - labelZh: Postgres 服务 (前置检查) - labelEn: Postgres Service (Pre-check) - required: true - type: apps - values: - - label: PostgreSQL - value: postgresql - - default: "/home/immich-app" - edit: true - envKey: IMMICH_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 2283 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "Asia/Shanghai" - edit: true - envKey: TZ - labelZh: 时区 - labelEn: Timezone - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: DB_HOSTNAME - labelZh: 数据库 主机地址 - labelEn: Database Host - required: true - type: text - - default: 5432 - edit: true - envKey: DB_PORT - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "postgres" - edit: true - envKey: DB_USERNAME - labelZh: 数据库 用户名 - labelEn: Database User - required: true - type: text - - default: "" - edit: true - envKey: DB_PASSWORD - labelZh: 数据库 密码 - labelEn: Database Password - random: true - required: true - rule: paramComplexity - type: password - - default: "immich" - edit: true - envKey: DB_DATABASE_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: REDIS_HOSTNAME - labelZh: Redis 主机 - labelEn: Redis Host - required: true - type: text - - default: 6379 - edit: true - envKey: REDIS_PORT - labelZh: Redis 端口 - labelEn: Redis Port - required: true - rule: paramPort - type: number - - default: 0 - edit: true - envKey: REDIS_DBINDEX - labelZh: Redis 索引 - labelEn: Redis Index - required: true - type: number - - default: "" - edit: true - envKey: REDIS_USERNAME - labelZh: Redis 用户名 - labelEn: Redis Username - required: false - type: text - - default: "" - edit: true - envKey: REDIS_PASSWORD - labelZh: Redis 密码 - labelEn: Redis Password - required: false - type: password - - default: "false" - edit: true - envKey: IMMICH_IGNORE_MOUNT_CHECK_ERRORS - labelZh: 是否跳过目录检查 - labelEn: Skip Mount Check - required: false - type: select - values: - - label: 跳过检查 - value: "true" - - label: 不跳过检查 - value: "false" diff --git a/appstore/immich-server/1.136.0/docker-compose.yml b/appstore/immich-server/1.136.0/docker-compose.yml deleted file mode 100644 index 90cd2aad0..000000000 --- a/appstore/immich-server/1.136.0/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: immich-server -networks: - 1panel-network: - external: true -services: - immich-server: - container_name: immich-server-immich-server - devices: - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:2283 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - - /etc/localtime:/etc/localtime diff --git a/appstore/immich-server/1.136.0/scripts/upgrade.sh b/appstore/immich-server/1.136.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/immich-server/1.136.0/scripts/upgrade.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich-server/1.132.3/.env b/appstore/immich-server/2.0.1/.env similarity index 100% rename from appstore/immich-server/1.132.3/.env rename to appstore/immich-server/2.0.1/.env diff --git a/appstore/immich-server/1.132.3/data.yml b/appstore/immich-server/2.0.1/data.yml similarity index 100% rename from appstore/immich-server/1.132.3/data.yml rename to appstore/immich-server/2.0.1/data.yml diff --git a/dockge/immich-server_1_136_0/docker-compose.yml b/appstore/immich-server/2.0.1/docker-compose.yml similarity index 69% rename from dockge/immich-server_1_136_0/docker-compose.yml rename to appstore/immich-server/2.0.1/docker-compose.yml index 90cd2aad0..7d4d5a6f2 100644 --- a/dockge/immich-server_1_136_0/docker-compose.yml +++ b/appstore/immich-server/2.0.1/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-server: - container_name: immich-server-immich-server + container_name: immich-server devices: - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 + image: ghcr.io/immich-app/immich-server:v2.0.1 labels: createdBy: Apps networks: @@ -19,5 +19,5 @@ services: - ${PANEL_APP_PORT_HTTP}:2283 restart: always volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload + - ${IMMICH_ROOT_PATH}/data/library:/data - /etc/localtime:/etc/localtime diff --git a/appstore/immich-no-machine/1.132.3/envs/default.env b/appstore/immich-server/2.0.1/envs/default.env similarity index 100% rename from appstore/immich-no-machine/1.132.3/envs/default.env rename to appstore/immich-server/2.0.1/envs/default.env diff --git a/appstore/immich-no-machine/1.132.3/envs/global.env b/appstore/immich-server/2.0.1/envs/global.env similarity index 100% rename from appstore/immich-no-machine/1.132.3/envs/global.env rename to appstore/immich-server/2.0.1/envs/global.env diff --git a/appstore/immich-no-machine/1.132.3/scripts/init.sh b/appstore/immich-server/2.0.1/scripts/init.sh similarity index 100% rename from appstore/immich-no-machine/1.132.3/scripts/init.sh rename to appstore/immich-server/2.0.1/scripts/init.sh diff --git a/appstore/immich-no-machine/1.132.3/scripts/uninstall.sh b/appstore/immich-server/2.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/immich-no-machine/1.132.3/scripts/uninstall.sh rename to appstore/immich-server/2.0.1/scripts/uninstall.sh diff --git a/appstore/immich-no-machine/1.132.3/scripts/upgrade.sh b/appstore/immich-server/2.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/immich-no-machine/1.132.3/scripts/upgrade.sh rename to appstore/immich-server/2.0.1/scripts/upgrade.sh diff --git a/appstore/immich-server/data.yml b/appstore/immich-server/data.yml index bb94dd1c8..1f38d52a0 100644 --- a/appstore/immich-server/data.yml +++ b/appstore/immich-server/data.yml @@ -8,8 +8,8 @@ shortDescZh: 高性能自托管照片和视频备份解决方案 shortDescEn: High performance self-hosted photo and video backup solution type: website - crossVersionUpdate: true + crossVersionUpdate: false limit: 0 website: https://immich.app/ - github: https://github.com/immich-app/immich - document: https://immich.app/docs/overview/introduction + github: https://github.com/immich-app/immich/ + document: https://docs.immich.app/ diff --git a/appstore/immich/1.132.3/docker-compose.yml b/appstore/immich/1.132.3/docker-compose.yml deleted file mode 100644 index 44a2398ec..000000000 --- a/appstore/immich/1.132.3/docker-compose.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: immich -networks: - 1panel-network: - external: true -services: - immich-machine-learning: - container_name: immich-machine-learning-immich - devices: &id001 - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_MACHINE_LEARNING}:3003 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/cache:/cache - immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on - container_name: pg14-vectors-immich - environment: - POSTGRES_DB: ${DB_DATABASE_NAME:-immich} - POSTGRES_INITDB_ARGS: --data-checksums - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_DB:-5432}:5432 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data - immich-server: - container_name: immich-server-immich - depends_on: - - immich-pg14-vectors - devices: *id001 - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:2283 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - - /etc/localtime:/etc/localtime diff --git a/appstore/immich/1.132.3/scripts/init.sh b/appstore/immich/1.132.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/immich/1.132.3/scripts/init.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich/1.132.3/scripts/uninstall.sh b/appstore/immich/1.132.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/appstore/immich/1.132.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich/1.132.3/scripts/upgrade.sh b/appstore/immich/1.132.3/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/immich/1.132.3/scripts/upgrade.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich/1.136.0/.env b/appstore/immich/1.136.0/.env deleted file mode 100644 index a4e4ae287..000000000 --- a/appstore/immich/1.136.0/.env +++ /dev/null @@ -1,54 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-app - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 机器学习端口 [必填] -PANEL_APP_PORT_MACHINE_LEARNING=3003 - -# 数据库连接密码 [必填] -DB_PASSWORD= - -# 数据库 端口 [必填] -PANEL_APP_PORT_DB=5432 - -# 数据库 主机地址 [必填] -DB_HOSTNAME=immich-pg14-vectors - -# 数据库 用户名 [必填] -DB_USERNAME=postgres - -# 数据库 名称 [必填] -DB_DATABASE_NAME=immich - -# Redis 主机 [必填] -REDIS_HOSTNAME=127.0.0.1 - -# Redis 端口 [必填] -REDIS_PORT=6379 - -# Redis 索引 [必填] -REDIS_DBINDEX=0 - -# Redis 用户名 -REDIS_USERNAME= - -# Redis 密码 -REDIS_PASSWORD= - -# 机器学习 预加载模型 -MACHINE_LEARNING_PRELOAD__CLIP=XLM-Roberta-Large-Vit-B-16Plus - -# 人脸识别 预加载模型 -MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION=buffalo_l - -# Hugging Face 服务地址 -HF_ENDPOINT=https://hf-mirror.com - -# 是否跳过目录检查 -IMMICH_IGNORE_MOUNT_CHECK_ERRORS=false - diff --git a/appstore/immich/1.136.0/data.yml b/appstore/immich/1.136.0/data.yml deleted file mode 100644 index 5dafe3219..000000000 --- a/appstore/immich/1.136.0/data.yml +++ /dev/null @@ -1,156 +0,0 @@ -additionalProperties: - formFields: - - child: - default: "" - envKey: PANEL_REDIS_SERVICE - required: true - type: service - default: redis - envKey: PANEL_REDIS_TYPE - labelZh: Redis 服务 (前置检查) - labelEn: Redis Service (Pre-check) - required: true - type: apps - values: - - label: Redis - value: redis - - default: "/home/immich-app" - edit: true - envKey: IMMICH_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 2283 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: 3003 - edit: true - envKey: PANEL_APP_PORT_MACHINE_LEARNING - labelZh: 机器学习端口 - labelEn: Machine Learning port - required: true - rule: paramPort - type: number - - default: "" - edit: true - envKey: DB_PASSWORD - labelEn: Database Password - labelZh: 数据库连接密码 - random: true - required: true - rule: paramComplexity - type: password - - default: 5432 - edit: true - envKey: PANEL_APP_PORT_DB - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "immich-pg14-vectors" - disabled: true - envKey: DB_HOSTNAME - labelZh: 数据库 主机地址 - labelEn: Database Host - required: true - type: text - - default: "postgres" - disabled: true - envKey: DB_USERNAME - labelZh: 数据库 用户名 - labelEn: Database User - required: true - type: text - - default: "immich" - disabled: true - envKey: DB_DATABASE_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - type: text - - default: "127.0.0.1" - edit: true - envKey: REDIS_HOSTNAME - labelZh: Redis 主机 - labelEn: Redis Host - required: true - type: text - - default: 6379 - edit: true - envKey: REDIS_PORT - labelZh: Redis 端口 - labelEn: Redis Port - required: true - rule: paramPort - type: number - - default: 0 - edit: true - envKey: REDIS_DBINDEX - labelZh: Redis 索引 - labelEn: Redis Index - required: true - type: number - - default: "" - edit: true - envKey: REDIS_USERNAME - labelZh: Redis 用户名 - labelEn: Redis Username - required: false - type: text - - default: "" - edit: true - envKey: REDIS_PASSWORD - labelZh: Redis 密码 - labelEn: Redis Password - required: false - type: password - - default: "XLM-Roberta-Large-Vit-B-16Plus" - edit: true - envKey: MACHINE_LEARNING_PRELOAD__CLIP - labelEn: Machine Learning Preload Model - labelZh: 机器学习 预加载模型 - required: false - type: text - - default: "buffalo_l" - edit: true - envKey: MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION - labelEn: Machine Learning Preload Model - labelZh: 人脸识别 预加载模型 - required: false - type: select - values: - - label: antelopev2 - value: "antelopev2" - - label: buffalo_l - value: "buffalo_l" - - label: buffalo_m - value: "buffalo_m" - - label: buffalo_s - value: "buffalo_s" - - default: "https://hf-mirror.com" - edit: true - envKey: HF_ENDPOINT - labelZh: Hugging Face 服务地址 - labelEn: Hugging Face Endpoint - rule: paramExtUrl - required: false - type: text - - default: "false" - edit: true - envKey: IMMICH_IGNORE_MOUNT_CHECK_ERRORS - labelZh: 是否跳过目录检查 - labelEn: Skip Mount Check - required: false - type: select - values: - - label: 跳过检查 - value: "true" - - label: 不跳过检查 - value: "false" diff --git a/appstore/immich/1.136.0/docker-compose.yml b/appstore/immich/1.136.0/docker-compose.yml deleted file mode 100644 index b1db34b69..000000000 --- a/appstore/immich/1.136.0/docker-compose.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: immich -networks: - 1panel-network: - external: true -services: - immich-machine-learning: - container_name: immich-machine-learning-immich - devices: &id001 - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_MACHINE_LEARNING}:3003 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/cache:/cache - immich-pg14-vectors: - container_name: pg14-vectors-immich - environment: - POSTGRES_DB: ${DB_DATABASE_NAME:-immich} - POSTGRES_INITDB_ARGS: --data-checksums - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_DB:-5432}:5432 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data - immich-server: - container_name: immich-server-immich - depends_on: - - immich-pg14-vectors - devices: *id001 - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:2283 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - - /etc/localtime:/etc/localtime diff --git a/appstore/immich/1.136.0/envs/default.env b/appstore/immich/1.136.0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/appstore/immich/1.136.0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/appstore/immich/1.136.0/envs/global.env b/appstore/immich/1.136.0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/appstore/immich/1.136.0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/appstore/immich/1.136.0/scripts/init.sh b/appstore/immich/1.136.0/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/immich/1.136.0/scripts/init.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich/1.136.0/scripts/uninstall.sh b/appstore/immich/1.136.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/appstore/immich/1.136.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich/1.136.0/scripts/upgrade.sh b/appstore/immich/1.136.0/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/immich/1.136.0/scripts/upgrade.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/immich/1.132.3/.env b/appstore/immich/2.0.1/.env similarity index 100% rename from appstore/immich/1.132.3/.env rename to appstore/immich/2.0.1/.env diff --git a/appstore/immich/1.132.3/data.yml b/appstore/immich/2.0.1/data.yml similarity index 100% rename from appstore/immich/1.132.3/data.yml rename to appstore/immich/2.0.1/data.yml diff --git a/dockge/immich_1_136_0/docker-compose.yml b/appstore/immich/2.0.1/docker-compose.yml similarity index 78% rename from dockge/immich_1_136_0/docker-compose.yml rename to appstore/immich/2.0.1/docker-compose.yml index b1db34b69..7949e94d4 100644 --- a/dockge/immich_1_136_0/docker-compose.yml +++ b/appstore/immich/2.0.1/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-machine-learning: - container_name: immich-machine-learning-immich + container_name: machine-learning-immich devices: &id001 - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 + image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 labels: createdBy: Apps networks: @@ -27,7 +27,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -38,14 +38,14 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data immich-server: - container_name: immich-server-immich + container_name: immich depends_on: - immich-pg14-vectors devices: *id001 env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 + image: ghcr.io/immich-app/immich-server:v2.0.1 labels: createdBy: Apps networks: @@ -54,5 +54,5 @@ services: - ${PANEL_APP_PORT_HTTP}:2283 restart: always volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload + - ${IMMICH_ROOT_PATH}/data/library:/data - /etc/localtime:/etc/localtime diff --git a/appstore/immich-no-machine/1.136.0/envs/default.env b/appstore/immich/2.0.1/envs/default.env similarity index 100% rename from appstore/immich-no-machine/1.136.0/envs/default.env rename to appstore/immich/2.0.1/envs/default.env diff --git a/appstore/immich-no-machine/1.136.0/envs/global.env b/appstore/immich/2.0.1/envs/global.env similarity index 100% rename from appstore/immich-no-machine/1.136.0/envs/global.env rename to appstore/immich/2.0.1/envs/global.env diff --git a/appstore/immich-no-machine/1.136.0/scripts/init.sh b/appstore/immich/2.0.1/scripts/init.sh similarity index 100% rename from appstore/immich-no-machine/1.136.0/scripts/init.sh rename to appstore/immich/2.0.1/scripts/init.sh diff --git a/appstore/immich-no-machine/1.136.0/scripts/uninstall.sh b/appstore/immich/2.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/immich-no-machine/1.136.0/scripts/uninstall.sh rename to appstore/immich/2.0.1/scripts/uninstall.sh diff --git a/appstore/immich-no-machine/1.136.0/scripts/upgrade.sh b/appstore/immich/2.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/immich-no-machine/1.136.0/scripts/upgrade.sh rename to appstore/immich/2.0.1/scripts/upgrade.sh diff --git a/appstore/immich/data.yml b/appstore/immich/data.yml index 7b79f7e6f..ce75bb2b9 100644 --- a/appstore/immich/data.yml +++ b/appstore/immich/data.yml @@ -9,8 +9,8 @@ shortDescZh: 高性能自托管照片和视频备份解决方案 shortDescEn: High performance self-hosted photo and video backup solution type: website - crossVersionUpdate: true + crossVersionUpdate: false limit: 0 website: https://immich.app/ github: https://github.com/immich-app/immich/ - document: https://immich.app/docs/overview/introduction/ + document: https://docs.immich.app/ diff --git a/appstore/nezha-dash/2.11.1/envs/default.env b/appstore/nezha-dash/2.11.1/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/appstore/nezha-dash/2.11.1/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/appstore/nezha-dash/2.11.1/envs/global.env b/appstore/nezha-dash/2.11.1/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/appstore/nezha-dash/2.11.1/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/appstore/nezha-dash/2.11.1/scripts/init.sh b/appstore/nezha-dash/2.11.1/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/nezha-dash/2.11.1/scripts/init.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/nezha-dash/2.11.1/scripts/uninstall.sh b/appstore/nezha-dash/2.11.1/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/appstore/nezha-dash/2.11.1/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/nezha-dash/2.11.1/scripts/upgrade.sh b/appstore/nezha-dash/2.11.1/scripts/upgrade.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/nezha-dash/2.11.1/scripts/upgrade.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/nezha-dash/2.11.1/.env b/appstore/nezha-dash/2.11.2/.env similarity index 100% rename from appstore/nezha-dash/2.11.1/.env rename to appstore/nezha-dash/2.11.2/.env diff --git a/appstore/nezha-dash/2.11.1/data.yml b/appstore/nezha-dash/2.11.2/data.yml similarity index 100% rename from appstore/nezha-dash/2.11.1/data.yml rename to appstore/nezha-dash/2.11.2/data.yml diff --git a/appstore/nezha-dash/2.11.1/docker-compose.yml b/appstore/nezha-dash/2.11.2/docker-compose.yml similarity index 94% rename from appstore/nezha-dash/2.11.1/docker-compose.yml rename to appstore/nezha-dash/2.11.2/docker-compose.yml index 0681f11b3..bce51082b 100644 --- a/appstore/nezha-dash/2.11.1/docker-compose.yml +++ b/appstore/nezha-dash/2.11.2/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.11.1 + image: hamster1963/nezha-dash:v2.11.2 labels: createdBy: Apps networks: diff --git a/appstore/immich-server/1.132.3/envs/default.env b/appstore/nezha-dash/2.11.2/envs/default.env similarity index 100% rename from appstore/immich-server/1.132.3/envs/default.env rename to appstore/nezha-dash/2.11.2/envs/default.env diff --git a/appstore/immich-server/1.132.3/envs/global.env b/appstore/nezha-dash/2.11.2/envs/global.env similarity index 100% rename from appstore/immich-server/1.132.3/envs/global.env rename to appstore/nezha-dash/2.11.2/envs/global.env diff --git a/appstore/immich-server/1.132.3/scripts/init.sh b/appstore/nezha-dash/2.11.2/scripts/init.sh similarity index 100% rename from appstore/immich-server/1.132.3/scripts/init.sh rename to appstore/nezha-dash/2.11.2/scripts/init.sh diff --git a/appstore/immich-server/1.132.3/scripts/uninstall.sh b/appstore/nezha-dash/2.11.2/scripts/uninstall.sh similarity index 100% rename from appstore/immich-server/1.132.3/scripts/uninstall.sh rename to appstore/nezha-dash/2.11.2/scripts/uninstall.sh diff --git a/appstore/immich-server/1.132.3/scripts/upgrade.sh b/appstore/nezha-dash/2.11.2/scripts/upgrade.sh similarity index 100% rename from appstore/immich-server/1.132.3/scripts/upgrade.sh rename to appstore/nezha-dash/2.11.2/scripts/upgrade.sh diff --git a/appstore/nezha/1.14.3/docker-compose.yml b/appstore/nezha/1.14.3/docker-compose.yml deleted file mode 100644 index f2120908f..000000000 --- a/appstore/nezha/1.14.3/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -networks: - 1panel-network: - external: true -services: - nezha: - container_name: nezha - environment: - - NZ_LISTEN_PORT=${PANEL_APP_PORT_HTTP} - - NZ_LOCATION=Asia/Shanghai - image: ghcr.io/nezhahq/nezha:v1.14.3 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - restart: always - volumes: - - ${NEZHA_ROOT_PATH}/data:/dashboard/data diff --git a/appstore/nezha/1.14.3/envs/default.env b/appstore/nezha/1.14.3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/appstore/nezha/1.14.3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/appstore/nezha/1.14.3/envs/global.env b/appstore/nezha/1.14.3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/appstore/nezha/1.14.3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/appstore/nezha/1.14.3/scripts/init.sh b/appstore/nezha/1.14.3/scripts/init.sh deleted file mode 100644 index 07fb8c3fe..000000000 --- a/appstore/nezha/1.14.3/scripts/init.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # 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." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/nezha/1.14.3/scripts/uninstall.sh b/appstore/nezha/1.14.3/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/appstore/nezha/1.14.3/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/nezha/1.14.3/.env b/appstore/nezha/1.14.5/.env similarity index 100% rename from appstore/nezha/1.14.3/.env rename to appstore/nezha/1.14.5/.env diff --git a/appstore/nezha/1.14.3/data.yml b/appstore/nezha/1.14.5/data.yml similarity index 100% rename from appstore/nezha/1.14.3/data.yml rename to appstore/nezha/1.14.5/data.yml diff --git a/appstore/nezha/1.14.3/data/config-example.yaml b/appstore/nezha/1.14.5/data/config-example.yaml similarity index 100% rename from appstore/nezha/1.14.3/data/config-example.yaml rename to appstore/nezha/1.14.5/data/config-example.yaml diff --git a/dockge/nezha_1_14_3/docker-compose.yml b/appstore/nezha/1.14.5/docker-compose.yml similarity index 90% rename from dockge/nezha_1_14_3/docker-compose.yml rename to appstore/nezha/1.14.5/docker-compose.yml index f2120908f..32273b3e9 100644 --- a/dockge/nezha_1_14_3/docker-compose.yml +++ b/appstore/nezha/1.14.5/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: - NZ_LISTEN_PORT=${PANEL_APP_PORT_HTTP} - NZ_LOCATION=Asia/Shanghai - image: ghcr.io/nezhahq/nezha:v1.14.3 + image: ghcr.io/nezhahq/nezha:v1.14.5 labels: createdBy: Apps networks: diff --git a/appstore/immich-server/1.136.0/envs/default.env b/appstore/nezha/1.14.5/envs/default.env similarity index 100% rename from appstore/immich-server/1.136.0/envs/default.env rename to appstore/nezha/1.14.5/envs/default.env diff --git a/appstore/immich-server/1.136.0/envs/global.env b/appstore/nezha/1.14.5/envs/global.env similarity index 100% rename from appstore/immich-server/1.136.0/envs/global.env rename to appstore/nezha/1.14.5/envs/global.env diff --git a/appstore/immich-server/1.136.0/scripts/init.sh b/appstore/nezha/1.14.5/scripts/init.sh similarity index 100% rename from appstore/immich-server/1.136.0/scripts/init.sh rename to appstore/nezha/1.14.5/scripts/init.sh diff --git a/appstore/immich-server/1.136.0/scripts/uninstall.sh b/appstore/nezha/1.14.5/scripts/uninstall.sh similarity index 100% rename from appstore/immich-server/1.136.0/scripts/uninstall.sh rename to appstore/nezha/1.14.5/scripts/uninstall.sh diff --git a/appstore/nezha/1.14.3/scripts/upgrade.sh b/appstore/nezha/1.14.5/scripts/upgrade.sh similarity index 100% rename from appstore/nezha/1.14.3/scripts/upgrade.sh rename to appstore/nezha/1.14.5/scripts/upgrade.sh diff --git a/dockge/immich-machine-learning/docker-compose.yml b/dockge/immich-machine-learning/docker-compose.yml index 0c0530ffe..c77f152ea 100644 --- a/dockge/immich-machine-learning/docker-compose.yml +++ b/dockge/immich-machine-learning/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-machine-learning: - container_name: immich-machine-learning-immich-machine-learning + container_name: immich-machine-learning devices: - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_136_0/.env b/dockge/immich-machine-learning_1_136_0/.env deleted file mode 100644 index 91116ad60..000000000 --- a/dockge/immich-machine-learning_1_136_0/.env +++ /dev/null @@ -1,21 +0,0 @@ -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-machine-learning - -# API 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 硬件驱动路径 [必填] -IMMICH_DRIVE_PATH=/dev/dri - -# 时区 [必填] -TZ=Asia/Shanghai - -# 机器学习 预加载模型 -MACHINE_LEARNING_PRELOAD__CLIP=XLM-Roberta-Large-Vit-B-16Plus - -# 人脸识别 预加载模型 -MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION=buffalo_l - -# Hugging Face 服务地址 -HF_ENDPOINT=https://hf-mirror.com - diff --git a/dockge/immich-machine-learning_1_136_0/docker-compose.yml b/dockge/immich-machine-learning_1_136_0/docker-compose.yml deleted file mode 100644 index 7e51478d0..000000000 --- a/dockge/immich-machine-learning_1_136_0/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: immich-machine-learning -networks: - 1panel-network: - external: true -services: - immich-machine-learning: - container_name: immich-machine-learning-immich-machine-learning - devices: - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:3003 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/dockge/immich-machine-learning_1_136_0/envs/default.env b/dockge/immich-machine-learning_1_136_0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/immich-machine-learning_1_136_0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/immich-machine-learning_1_136_0/envs/global.env b/dockge/immich-machine-learning_1_136_0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/immich-machine-learning_1_136_0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/immich-no-machine/docker-compose.yml b/dockge/immich-no-machine/docker-compose.yml index 0ad713e57..f845557b2 100644 --- a/dockge/immich-no-machine/docker-compose.yml +++ b/dockge/immich-no-machine/docker-compose.yml @@ -4,36 +4,13 @@ networks: external: true services: immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -44,7 +21,7 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data immich-server: - container_name: immich-server-immich-no-machine + container_name: immich-no-machine depends_on: - immich-pg14-vectors devices: @@ -52,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v2.0.1 labels: createdBy: Apps networks: @@ -61,5 +38,5 @@ services: - ${PANEL_APP_PORT_HTTP}:2283 restart: always volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload + - ${IMMICH_ROOT_PATH}/data/library:/data - /etc/localtime:/etc/localtime diff --git a/dockge/immich-no-machine_1_136_0/.env b/dockge/immich-no-machine_1_136_0/.env deleted file mode 100644 index da1ba0f59..000000000 --- a/dockge/immich-no-machine_1_136_0/.env +++ /dev/null @@ -1,42 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-app - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 数据库连接密码 [必填] -DB_PASSWORD= - -# 数据库 端口 [必填] -PANEL_APP_PORT_DB=5432 - -# 数据库 主机地址 [必填] -DB_HOSTNAME=immich-pg14-vectors - -# 数据库 用户名 [必填] -DB_USERNAME=postgres - -# 数据库 名称 [必填] -DB_DATABASE_NAME=immich - -# Redis 主机 [必填] -REDIS_HOSTNAME=127.0.0.1 - -# Redis 端口 [必填] -REDIS_PORT=6379 - -# Redis 索引 [必填] -REDIS_DBINDEX=0 - -# Redis 用户名 -REDIS_USERNAME= - -# Redis 密码 -REDIS_PASSWORD= - -# 是否跳过目录检查 -IMMICH_IGNORE_MOUNT_CHECK_ERRORS=false - diff --git a/dockge/immich-no-machine_1_136_0/docker-compose.yml b/dockge/immich-no-machine_1_136_0/docker-compose.yml deleted file mode 100644 index f953ba274..000000000 --- a/dockge/immich-no-machine_1_136_0/docker-compose.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: immich -networks: - 1panel-network: - external: true -services: - immich-pg14-vectors: - container_name: pg14-vectors-immich-no-machine - environment: - POSTGRES_DB: ${DB_DATABASE_NAME:-immich} - POSTGRES_INITDB_ARGS: --data-checksums - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_DB:-5432}:5432 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data - immich-server: - container_name: immich-server-immich-no-machine - depends_on: - - immich-pg14-vectors - devices: - - /dev/dri:/dev/dri - env_file: - - ./envs/global.env - - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:2283 - restart: always - volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload - - /etc/localtime:/etc/localtime diff --git a/dockge/immich-no-machine_1_136_0/envs/default.env b/dockge/immich-no-machine_1_136_0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/immich-no-machine_1_136_0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/immich-no-machine_1_136_0/envs/global.env b/dockge/immich-no-machine_1_136_0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/immich-no-machine_1_136_0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/immich-server/docker-compose.yml b/dockge/immich-server/docker-compose.yml index 1f7695a07..7d4d5a6f2 100644 --- a/dockge/immich-server/docker-compose.yml +++ b/dockge/immich-server/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-server: - container_name: immich-server-immich-server + container_name: immich-server devices: - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v2.0.1 labels: createdBy: Apps networks: @@ -19,5 +19,5 @@ services: - ${PANEL_APP_PORT_HTTP}:2283 restart: always volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload + - ${IMMICH_ROOT_PATH}/data/library:/data - /etc/localtime:/etc/localtime diff --git a/dockge/immich-server_1_136_0/.env b/dockge/immich-server_1_136_0/.env deleted file mode 100644 index 27aea5506..000000000 --- a/dockge/immich-server_1_136_0/.env +++ /dev/null @@ -1,48 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# Postgres 服务 (前置检查) [必填] -PANEL_POSTGRES_TYPE=postgresql - -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-app - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 时区 [必填] -TZ=Asia/Shanghai - -# 数据库 主机地址 [必填] -DB_HOSTNAME=127.0.0.1 - -# 数据库 端口 [必填] -DB_PORT=5432 - -# 数据库 用户名 [必填] -DB_USERNAME=postgres - -# 数据库 密码 [必填] -DB_PASSWORD= - -# 数据库 名称 [必填] -DB_DATABASE_NAME=immich - -# Redis 主机 [必填] -REDIS_HOSTNAME=127.0.0.1 - -# Redis 端口 [必填] -REDIS_PORT=6379 - -# Redis 索引 [必填] -REDIS_DBINDEX=0 - -# Redis 用户名 -REDIS_USERNAME= - -# Redis 密码 -REDIS_PASSWORD= - -# 是否跳过目录检查 -IMMICH_IGNORE_MOUNT_CHECK_ERRORS=false - diff --git a/dockge/immich-server_1_136_0/envs/default.env b/dockge/immich-server_1_136_0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/immich-server_1_136_0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/immich-server_1_136_0/envs/global.env b/dockge/immich-server_1_136_0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/immich-server_1_136_0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/immich/docker-compose.yml b/dockge/immich/docker-compose.yml index 44a2398ec..7949e94d4 100644 --- a/dockge/immich/docker-compose.yml +++ b/dockge/immich/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-machine-learning: - container_name: immich-machine-learning-immich + container_name: machine-learning-immich devices: &id001 - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 labels: createdBy: Apps networks: @@ -21,36 +21,13 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -61,14 +38,14 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data immich-server: - container_name: immich-server-immich + container_name: immich depends_on: - immich-pg14-vectors devices: *id001 env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v2.0.1 labels: createdBy: Apps networks: @@ -77,5 +54,5 @@ services: - ${PANEL_APP_PORT_HTTP}:2283 restart: always volumes: - - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload + - ${IMMICH_ROOT_PATH}/data/library:/data - /etc/localtime:/etc/localtime diff --git a/dockge/immich_1_136_0/.env b/dockge/immich_1_136_0/.env deleted file mode 100644 index a4e4ae287..000000000 --- a/dockge/immich_1_136_0/.env +++ /dev/null @@ -1,54 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# 数据持久化路径 [必填] -IMMICH_ROOT_PATH=/home/immich-app - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=2283 - -# 机器学习端口 [必填] -PANEL_APP_PORT_MACHINE_LEARNING=3003 - -# 数据库连接密码 [必填] -DB_PASSWORD= - -# 数据库 端口 [必填] -PANEL_APP_PORT_DB=5432 - -# 数据库 主机地址 [必填] -DB_HOSTNAME=immich-pg14-vectors - -# 数据库 用户名 [必填] -DB_USERNAME=postgres - -# 数据库 名称 [必填] -DB_DATABASE_NAME=immich - -# Redis 主机 [必填] -REDIS_HOSTNAME=127.0.0.1 - -# Redis 端口 [必填] -REDIS_PORT=6379 - -# Redis 索引 [必填] -REDIS_DBINDEX=0 - -# Redis 用户名 -REDIS_USERNAME= - -# Redis 密码 -REDIS_PASSWORD= - -# 机器学习 预加载模型 -MACHINE_LEARNING_PRELOAD__CLIP=XLM-Roberta-Large-Vit-B-16Plus - -# 人脸识别 预加载模型 -MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION=buffalo_l - -# Hugging Face 服务地址 -HF_ENDPOINT=https://hf-mirror.com - -# 是否跳过目录检查 -IMMICH_IGNORE_MOUNT_CHECK_ERRORS=false - diff --git a/dockge/immich_1_136_0/envs/default.env b/dockge/immich_1_136_0/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/immich_1_136_0/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/immich_1_136_0/envs/global.env b/dockge/immich_1_136_0/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/immich_1_136_0/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/nezha-dash/docker-compose.yml b/dockge/nezha-dash/docker-compose.yml index 0681f11b3..bce51082b 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.11.1 + image: hamster1963/nezha-dash:v2.11.2 labels: createdBy: Apps networks: diff --git a/dockge/nezha/.env b/dockge/nezha/.env index 54509260f..6adf2af10 100644 --- a/dockge/nezha/.env +++ b/dockge/nezha/.env @@ -4,30 +4,39 @@ NEZHA_ROOT_PATH=/home/nezha # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=8008 -# gRPC 端口 [必填] -PANEL_APP_PORT_GRPC=5555 +# 系统语言 [必填] +NZ_LANGUAGE=zh_CN + +# 数据持久化路径 [必填] +NZ_SITE_NAME=哪吒监控 + +# Agent是否启用TLS [必填] +NZ_TLS=false # OAuth 服务商 [必填] -OAUTH2_TYPE=github +NZ_OAUTH2_TYPE=github # 管理员账号ID [必填] -OAUTH2_ADMIN= +NZ_OAUTH2_ADMIN= # OAuth 客户端 ID [必填] -OAUTH2_CLIENTID= +NZ_OAUTH2_CLIENTID= # OAuth 客户端 Secret [必填] -OAUTH2_CLIENTSECRET= +NZ_OAUTH2_CLIENTSECRET= # OAuth 端点 (可选) -OAUTH2_ENDPOINT= +NZ_OAUTH2_ENDPOINT= -# 网站标题 [必填] -NZ_SITE_TITLE=哪吒监控 +# 登录有效期 (小时) [必填] +NZ_JWT_TIMEOUT=1 -# Cookie 名称 (默认) [必填] -NZ_COOKIE_NAME=nezha-dashboard +# 强制认证 [必填] +NZ_FORCE_AUTH=false -# 网站主题 (默认) [必填] -NZ_THEME=default +# 是否脱敏通知IP [必填] +NZ_ENABLE_PLAIN_IP_IN_NOTIFICATION=false + +# IP 变更通知 [必填] +NZ_ENABLE_IP_CHANGE_NOTIFICATION=false diff --git a/dockge/nezha/data/config-example.yaml b/dockge/nezha/data/config-example.yaml index d063cf9f9..f9d20745b 100644 --- a/dockge/nezha/data/config-example.yaml +++ b/dockge/nezha/data/config-example.yaml @@ -1,33 +1,6 @@ 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: "" +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/docker-compose.yml b/dockge/nezha/docker-compose.yml index ff7b23dd8..32273b3e9 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/docker-compose.yml @@ -2,19 +2,18 @@ networks: 1panel-network: external: true services: - nezha-dashboard: + nezha: container_name: nezha - image: ghcr.io/naiba/nezha-dashboard:v0.20.13 + environment: + - NZ_LISTEN_PORT=${PANEL_APP_PORT_HTTP} + - NZ_LOCATION=Asia/Shanghai + image: ghcr.io/nezhahq/nezha:v1.14.5 labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_GRPC}:${PANEL_APP_PORT_GRPC} + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} 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 new file mode 100644 index 000000000..54509260f --- /dev/null +++ b/dockge/nezha_0_20_13/.env @@ -0,0 +1,33 @@ +# 数据持久化路径 [必填] +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 new file mode 100644 index 000000000..d063cf9f9 --- /dev/null +++ b/dockge/nezha_0_20_13/data/config-example.yaml @@ -0,0 +1,33 @@ +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 new file mode 100644 index 000000000..ff7b23dd8 --- /dev/null +++ b/dockge/nezha_0_20_13/docker-compose.yml @@ -0,0 +1,20 @@ +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/appstore/immich/1.132.3/envs/default.env b/dockge/nezha_0_20_13/envs/default.env similarity index 100% rename from appstore/immich/1.132.3/envs/default.env rename to dockge/nezha_0_20_13/envs/default.env diff --git a/appstore/immich/1.132.3/envs/global.env b/dockge/nezha_0_20_13/envs/global.env similarity index 100% rename from appstore/immich/1.132.3/envs/global.env rename to dockge/nezha_0_20_13/envs/global.env diff --git a/dockge/nezha_1_14_3/.env b/dockge/nezha_1_14_3/.env deleted file mode 100644 index 6adf2af10..000000000 --- a/dockge/nezha_1_14_3/.env +++ /dev/null @@ -1,42 +0,0 @@ -# 数据持久化路径 [必填] -NEZHA_ROOT_PATH=/home/nezha - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8008 - -# 系统语言 [必填] -NZ_LANGUAGE=zh_CN - -# 数据持久化路径 [必填] -NZ_SITE_NAME=哪吒监控 - -# Agent是否启用TLS [必填] -NZ_TLS=false - -# OAuth 服务商 [必填] -NZ_OAUTH2_TYPE=github - -# 管理员账号ID [必填] -NZ_OAUTH2_ADMIN= - -# OAuth 客户端 ID [必填] -NZ_OAUTH2_CLIENTID= - -# OAuth 客户端 Secret [必填] -NZ_OAUTH2_CLIENTSECRET= - -# OAuth 端点 (可选) -NZ_OAUTH2_ENDPOINT= - -# 登录有效期 (小时) [必填] -NZ_JWT_TIMEOUT=1 - -# 强制认证 [必填] -NZ_FORCE_AUTH=false - -# 是否脱敏通知IP [必填] -NZ_ENABLE_PLAIN_IP_IN_NOTIFICATION=false - -# IP 变更通知 [必填] -NZ_ENABLE_IP_CHANGE_NOTIFICATION=false - diff --git a/dockge/nezha_1_14_3/data/config-example.yaml b/dockge/nezha_1_14_3/data/config-example.yaml deleted file mode 100644 index f9d20745b..000000000 --- a/dockge/nezha_1_14_3/data/config-example.yaml +++ /dev/null @@ -1,6 +0,0 @@ -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_1_14_3/envs/default.env b/dockge/nezha_1_14_3/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/nezha_1_14_3/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/nezha_1_14_3/envs/global.env b/dockge/nezha_1_14_3/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/nezha_1_14_3/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai