From b1aec3df58c8030c1ea14bfaded530f04a9a0974 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 03:33:11 +0000 Subject: [PATCH 001/262] 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 From d2e8f7a4c25c680e4b4527c3f14b33dbc8feaa4e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 03:34:33 +0000 Subject: [PATCH 002/262] Update qyg2297248353/bili-fetcher Docker tag to v1.6.7 --- apps/bili-fetcher/1.6.6/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bili-fetcher/1.6.6/docker-compose.yml b/apps/bili-fetcher/1.6.6/docker-compose.yml index f380e4035..7f36edac8 100644 --- a/apps/bili-fetcher/1.6.6/docker-compose.yml +++ b/apps/bili-fetcher/1.6.6/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: bili-fetcher-api: - image: qyg2297248353/bili-fetcher:v1.6.6 + image: qyg2297248353/bili-fetcher:v1.6.7 container_name: api-${CONTAINER_NAME} restart: always networks: From b017c2efbf08a71753ea2b90b844bb4ec0b4a3c7 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 03:34:56 +0000 Subject: [PATCH 003/262] Update app version [skip ci] --- apps/bili-fetcher/{1.6.6 => 1.6.7}/config/categories.json | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/config/config.yaml | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/config/scheduler_config.yaml | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/config/sql_statements_mysql.py | 0 .../bili-fetcher/{1.6.6 => 1.6.7}/config/sql_statements_sqlite.py | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/config/template.html | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/data.yml | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/docker-compose.yml | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/envs/default.env | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/envs/global.env | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/scripts/init.sh | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/scripts/uninstall.sh | 0 apps/bili-fetcher/{1.6.6 => 1.6.7}/scripts/upgrade.sh | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/config/categories.json (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/config/config.yaml (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/config/scheduler_config.yaml (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/config/sql_statements_mysql.py (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/config/sql_statements_sqlite.py (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/config/template.html (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/data.yml (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/docker-compose.yml (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/envs/default.env (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/envs/global.env (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/scripts/init.sh (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/scripts/uninstall.sh (100%) rename apps/bili-fetcher/{1.6.6 => 1.6.7}/scripts/upgrade.sh (100%) diff --git a/apps/bili-fetcher/1.6.6/config/categories.json b/apps/bili-fetcher/1.6.7/config/categories.json similarity index 100% rename from apps/bili-fetcher/1.6.6/config/categories.json rename to apps/bili-fetcher/1.6.7/config/categories.json diff --git a/apps/bili-fetcher/1.6.6/config/config.yaml b/apps/bili-fetcher/1.6.7/config/config.yaml similarity index 100% rename from apps/bili-fetcher/1.6.6/config/config.yaml rename to apps/bili-fetcher/1.6.7/config/config.yaml diff --git a/apps/bili-fetcher/1.6.6/config/scheduler_config.yaml b/apps/bili-fetcher/1.6.7/config/scheduler_config.yaml similarity index 100% rename from apps/bili-fetcher/1.6.6/config/scheduler_config.yaml rename to apps/bili-fetcher/1.6.7/config/scheduler_config.yaml diff --git a/apps/bili-fetcher/1.6.6/config/sql_statements_mysql.py b/apps/bili-fetcher/1.6.7/config/sql_statements_mysql.py similarity index 100% rename from apps/bili-fetcher/1.6.6/config/sql_statements_mysql.py rename to apps/bili-fetcher/1.6.7/config/sql_statements_mysql.py diff --git a/apps/bili-fetcher/1.6.6/config/sql_statements_sqlite.py b/apps/bili-fetcher/1.6.7/config/sql_statements_sqlite.py similarity index 100% rename from apps/bili-fetcher/1.6.6/config/sql_statements_sqlite.py rename to apps/bili-fetcher/1.6.7/config/sql_statements_sqlite.py diff --git a/apps/bili-fetcher/1.6.6/config/template.html b/apps/bili-fetcher/1.6.7/config/template.html similarity index 100% rename from apps/bili-fetcher/1.6.6/config/template.html rename to apps/bili-fetcher/1.6.7/config/template.html diff --git a/apps/bili-fetcher/1.6.6/data.yml b/apps/bili-fetcher/1.6.7/data.yml similarity index 100% rename from apps/bili-fetcher/1.6.6/data.yml rename to apps/bili-fetcher/1.6.7/data.yml diff --git a/apps/bili-fetcher/1.6.6/docker-compose.yml b/apps/bili-fetcher/1.6.7/docker-compose.yml similarity index 100% rename from apps/bili-fetcher/1.6.6/docker-compose.yml rename to apps/bili-fetcher/1.6.7/docker-compose.yml diff --git a/apps/bili-fetcher/1.6.6/envs/default.env b/apps/bili-fetcher/1.6.7/envs/default.env similarity index 100% rename from apps/bili-fetcher/1.6.6/envs/default.env rename to apps/bili-fetcher/1.6.7/envs/default.env diff --git a/apps/bili-fetcher/1.6.6/envs/global.env b/apps/bili-fetcher/1.6.7/envs/global.env similarity index 100% rename from apps/bili-fetcher/1.6.6/envs/global.env rename to apps/bili-fetcher/1.6.7/envs/global.env diff --git a/apps/bili-fetcher/1.6.6/scripts/init.sh b/apps/bili-fetcher/1.6.7/scripts/init.sh similarity index 100% rename from apps/bili-fetcher/1.6.6/scripts/init.sh rename to apps/bili-fetcher/1.6.7/scripts/init.sh diff --git a/apps/bili-fetcher/1.6.6/scripts/uninstall.sh b/apps/bili-fetcher/1.6.7/scripts/uninstall.sh similarity index 100% rename from apps/bili-fetcher/1.6.6/scripts/uninstall.sh rename to apps/bili-fetcher/1.6.7/scripts/uninstall.sh diff --git a/apps/bili-fetcher/1.6.6/scripts/upgrade.sh b/apps/bili-fetcher/1.6.7/scripts/upgrade.sh similarity index 100% rename from apps/bili-fetcher/1.6.6/scripts/upgrade.sh rename to apps/bili-fetcher/1.6.7/scripts/upgrade.sh From 31e357477ae3f6875f18d0b1a88e75059a1f54b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 04:19:55 +0000 Subject: [PATCH 004/262] Update qyg2297248353/deeplx Docker tag to v1.0.9.1 --- apps/deeplx/1.0.8.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/deeplx/1.0.8.1/docker-compose.yml b/apps/deeplx/1.0.8.1/docker-compose.yml index 57ec989ba..d83573385 100644 --- a/apps/deeplx/1.0.8.1/docker-compose.yml +++ b/apps/deeplx/1.0.8.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: deeplx: - image: qyg2297248353/deeplx:v1.0.8.1 + image: qyg2297248353/deeplx:v1.0.9.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 26635f816abdf29a3b0e00a82323495aeb750892 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 04:20:06 +0000 Subject: [PATCH 005/262] Update app version [skip ci] --- apps/deeplx/{1.0.8.1 => 1.0.9.1}/data.yml | 0 apps/deeplx/{1.0.8.1 => 1.0.9.1}/docker-compose.yml | 0 apps/deeplx/{1.0.8.1 => 1.0.9.1}/envs/default.env | 0 apps/deeplx/{1.0.8.1 => 1.0.9.1}/envs/global.env | 0 apps/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/init.sh | 0 apps/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/uninstall.sh | 0 apps/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/data.yml (100%) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/docker-compose.yml (100%) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/envs/default.env (100%) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/envs/global.env (100%) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/init.sh (100%) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/uninstall.sh (100%) rename apps/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/upgrade.sh (100%) diff --git a/apps/deeplx/1.0.8.1/data.yml b/apps/deeplx/1.0.9.1/data.yml similarity index 100% rename from apps/deeplx/1.0.8.1/data.yml rename to apps/deeplx/1.0.9.1/data.yml diff --git a/apps/deeplx/1.0.8.1/docker-compose.yml b/apps/deeplx/1.0.9.1/docker-compose.yml similarity index 100% rename from apps/deeplx/1.0.8.1/docker-compose.yml rename to apps/deeplx/1.0.9.1/docker-compose.yml diff --git a/apps/deeplx/1.0.8.1/envs/default.env b/apps/deeplx/1.0.9.1/envs/default.env similarity index 100% rename from apps/deeplx/1.0.8.1/envs/default.env rename to apps/deeplx/1.0.9.1/envs/default.env diff --git a/apps/deeplx/1.0.8.1/envs/global.env b/apps/deeplx/1.0.9.1/envs/global.env similarity index 100% rename from apps/deeplx/1.0.8.1/envs/global.env rename to apps/deeplx/1.0.9.1/envs/global.env diff --git a/apps/deeplx/1.0.8.1/scripts/init.sh b/apps/deeplx/1.0.9.1/scripts/init.sh similarity index 100% rename from apps/deeplx/1.0.8.1/scripts/init.sh rename to apps/deeplx/1.0.9.1/scripts/init.sh diff --git a/apps/deeplx/1.0.8.1/scripts/uninstall.sh b/apps/deeplx/1.0.9.1/scripts/uninstall.sh similarity index 100% rename from apps/deeplx/1.0.8.1/scripts/uninstall.sh rename to apps/deeplx/1.0.9.1/scripts/uninstall.sh diff --git a/apps/deeplx/1.0.8.1/scripts/upgrade.sh b/apps/deeplx/1.0.9.1/scripts/upgrade.sh similarity index 100% rename from apps/deeplx/1.0.8.1/scripts/upgrade.sh rename to apps/deeplx/1.0.9.1/scripts/upgrade.sh From b70c9b5f8bc59b1972b932879ddb480333e73544 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 04:29:36 +0000 Subject: [PATCH 006/262] Update qyg2297248353/bili-fetcher-web Docker tag to v1.6.7 --- apps/bili-fetcher/1.6.7/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bili-fetcher/1.6.7/docker-compose.yml b/apps/bili-fetcher/1.6.7/docker-compose.yml index 7f36edac8..c98770484 100644 --- a/apps/bili-fetcher/1.6.7/docker-compose.yml +++ b/apps/bili-fetcher/1.6.7/docker-compose.yml @@ -22,7 +22,7 @@ services: - DOCKER_ENV=true bili-fetcher-web: - image: qyg2297248353/bili-fetcher-web:v1.6.6 + image: qyg2297248353/bili-fetcher-web:v1.6.7 depends_on: - bili-fetcher-api container_name: ${CONTAINER_NAME} From 70b76d6c34abab7a5679034d950b9e94b3349463 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 06:32:43 +0000 Subject: [PATCH 007/262] Processed apps directory via GitHub Actions --- appstore/bili-fetcher/{1.6.6 => 1.6.7}/.env | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/categories.json | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/config.yaml | 0 .../{1.6.6 => 1.6.7}/config/scheduler_config.yaml | 0 .../{1.6.6 => 1.6.7}/config/sql_statements_mysql.py | 0 .../{1.6.6 => 1.6.7}/config/sql_statements_sqlite.py | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/template.html | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/data.yml | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/docker-compose.yml | 4 ++-- appstore/bili-fetcher/{1.6.6 => 1.6.7}/envs/default.env | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/envs/global.env | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/scripts/init.sh | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/scripts/uninstall.sh | 0 appstore/bili-fetcher/{1.6.6 => 1.6.7}/scripts/upgrade.sh | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/.env | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/data.yml | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/docker-compose.yml | 2 +- appstore/deeplx/{1.0.8.1 => 1.0.9.1}/envs/default.env | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/envs/global.env | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/init.sh | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/uninstall.sh | 0 appstore/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/upgrade.sh | 0 dockge/bili-fetcher/docker-compose.yml | 4 ++-- dockge/deeplx/docker-compose.yml | 2 +- 24 files changed, 6 insertions(+), 6 deletions(-) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/.env (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/categories.json (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/config.yaml (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/scheduler_config.yaml (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/sql_statements_mysql.py (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/sql_statements_sqlite.py (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/config/template.html (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/data.yml (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/docker-compose.yml (88%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/envs/default.env (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/envs/global.env (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/scripts/init.sh (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/scripts/uninstall.sh (100%) rename appstore/bili-fetcher/{1.6.6 => 1.6.7}/scripts/upgrade.sh (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/.env (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/data.yml (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/docker-compose.yml (88%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/envs/default.env (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/envs/global.env (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/init.sh (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/uninstall.sh (100%) rename appstore/deeplx/{1.0.8.1 => 1.0.9.1}/scripts/upgrade.sh (100%) diff --git a/appstore/bili-fetcher/1.6.6/.env b/appstore/bili-fetcher/1.6.7/.env similarity index 100% rename from appstore/bili-fetcher/1.6.6/.env rename to appstore/bili-fetcher/1.6.7/.env diff --git a/appstore/bili-fetcher/1.6.6/config/categories.json b/appstore/bili-fetcher/1.6.7/config/categories.json similarity index 100% rename from appstore/bili-fetcher/1.6.6/config/categories.json rename to appstore/bili-fetcher/1.6.7/config/categories.json diff --git a/appstore/bili-fetcher/1.6.6/config/config.yaml b/appstore/bili-fetcher/1.6.7/config/config.yaml similarity index 100% rename from appstore/bili-fetcher/1.6.6/config/config.yaml rename to appstore/bili-fetcher/1.6.7/config/config.yaml diff --git a/appstore/bili-fetcher/1.6.6/config/scheduler_config.yaml b/appstore/bili-fetcher/1.6.7/config/scheduler_config.yaml similarity index 100% rename from appstore/bili-fetcher/1.6.6/config/scheduler_config.yaml rename to appstore/bili-fetcher/1.6.7/config/scheduler_config.yaml diff --git a/appstore/bili-fetcher/1.6.6/config/sql_statements_mysql.py b/appstore/bili-fetcher/1.6.7/config/sql_statements_mysql.py similarity index 100% rename from appstore/bili-fetcher/1.6.6/config/sql_statements_mysql.py rename to appstore/bili-fetcher/1.6.7/config/sql_statements_mysql.py diff --git a/appstore/bili-fetcher/1.6.6/config/sql_statements_sqlite.py b/appstore/bili-fetcher/1.6.7/config/sql_statements_sqlite.py similarity index 100% rename from appstore/bili-fetcher/1.6.6/config/sql_statements_sqlite.py rename to appstore/bili-fetcher/1.6.7/config/sql_statements_sqlite.py diff --git a/appstore/bili-fetcher/1.6.6/config/template.html b/appstore/bili-fetcher/1.6.7/config/template.html similarity index 100% rename from appstore/bili-fetcher/1.6.6/config/template.html rename to appstore/bili-fetcher/1.6.7/config/template.html diff --git a/appstore/bili-fetcher/1.6.6/data.yml b/appstore/bili-fetcher/1.6.7/data.yml similarity index 100% rename from appstore/bili-fetcher/1.6.6/data.yml rename to appstore/bili-fetcher/1.6.7/data.yml diff --git a/appstore/bili-fetcher/1.6.6/docker-compose.yml b/appstore/bili-fetcher/1.6.7/docker-compose.yml similarity index 88% rename from appstore/bili-fetcher/1.6.6/docker-compose.yml rename to appstore/bili-fetcher/1.6.7/docker-compose.yml index 7886c5337..dcdde88d9 100644 --- a/appstore/bili-fetcher/1.6.6/docker-compose.yml +++ b/appstore/bili-fetcher/1.6.7/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.6 + image: qyg2297248353/bili-fetcher:v1.6.7 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.6 + image: qyg2297248353/bili-fetcher-web:v1.6.7 labels: createdBy: Apps networks: diff --git a/appstore/bili-fetcher/1.6.6/envs/default.env b/appstore/bili-fetcher/1.6.7/envs/default.env similarity index 100% rename from appstore/bili-fetcher/1.6.6/envs/default.env rename to appstore/bili-fetcher/1.6.7/envs/default.env diff --git a/appstore/bili-fetcher/1.6.6/envs/global.env b/appstore/bili-fetcher/1.6.7/envs/global.env similarity index 100% rename from appstore/bili-fetcher/1.6.6/envs/global.env rename to appstore/bili-fetcher/1.6.7/envs/global.env diff --git a/appstore/bili-fetcher/1.6.6/scripts/init.sh b/appstore/bili-fetcher/1.6.7/scripts/init.sh similarity index 100% rename from appstore/bili-fetcher/1.6.6/scripts/init.sh rename to appstore/bili-fetcher/1.6.7/scripts/init.sh diff --git a/appstore/bili-fetcher/1.6.6/scripts/uninstall.sh b/appstore/bili-fetcher/1.6.7/scripts/uninstall.sh similarity index 100% rename from appstore/bili-fetcher/1.6.6/scripts/uninstall.sh rename to appstore/bili-fetcher/1.6.7/scripts/uninstall.sh diff --git a/appstore/bili-fetcher/1.6.6/scripts/upgrade.sh b/appstore/bili-fetcher/1.6.7/scripts/upgrade.sh similarity index 100% rename from appstore/bili-fetcher/1.6.6/scripts/upgrade.sh rename to appstore/bili-fetcher/1.6.7/scripts/upgrade.sh diff --git a/appstore/deeplx/1.0.8.1/.env b/appstore/deeplx/1.0.9.1/.env similarity index 100% rename from appstore/deeplx/1.0.8.1/.env rename to appstore/deeplx/1.0.9.1/.env diff --git a/appstore/deeplx/1.0.8.1/data.yml b/appstore/deeplx/1.0.9.1/data.yml similarity index 100% rename from appstore/deeplx/1.0.8.1/data.yml rename to appstore/deeplx/1.0.9.1/data.yml diff --git a/appstore/deeplx/1.0.8.1/docker-compose.yml b/appstore/deeplx/1.0.9.1/docker-compose.yml similarity index 88% rename from appstore/deeplx/1.0.8.1/docker-compose.yml rename to appstore/deeplx/1.0.9.1/docker-compose.yml index c27a767ad..fe7864ca7 100644 --- a/appstore/deeplx/1.0.8.1/docker-compose.yml +++ b/appstore/deeplx/1.0.9.1/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - PORT=1188 - image: qyg2297248353/deeplx:v1.0.8.1 + image: qyg2297248353/deeplx:v1.0.9.1 labels: createdBy: Apps networks: diff --git a/appstore/deeplx/1.0.8.1/envs/default.env b/appstore/deeplx/1.0.9.1/envs/default.env similarity index 100% rename from appstore/deeplx/1.0.8.1/envs/default.env rename to appstore/deeplx/1.0.9.1/envs/default.env diff --git a/appstore/deeplx/1.0.8.1/envs/global.env b/appstore/deeplx/1.0.9.1/envs/global.env similarity index 100% rename from appstore/deeplx/1.0.8.1/envs/global.env rename to appstore/deeplx/1.0.9.1/envs/global.env diff --git a/appstore/deeplx/1.0.8.1/scripts/init.sh b/appstore/deeplx/1.0.9.1/scripts/init.sh similarity index 100% rename from appstore/deeplx/1.0.8.1/scripts/init.sh rename to appstore/deeplx/1.0.9.1/scripts/init.sh diff --git a/appstore/deeplx/1.0.8.1/scripts/uninstall.sh b/appstore/deeplx/1.0.9.1/scripts/uninstall.sh similarity index 100% rename from appstore/deeplx/1.0.8.1/scripts/uninstall.sh rename to appstore/deeplx/1.0.9.1/scripts/uninstall.sh diff --git a/appstore/deeplx/1.0.8.1/scripts/upgrade.sh b/appstore/deeplx/1.0.9.1/scripts/upgrade.sh similarity index 100% rename from appstore/deeplx/1.0.8.1/scripts/upgrade.sh rename to appstore/deeplx/1.0.9.1/scripts/upgrade.sh diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index 7886c5337..dcdde88d9 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.6 + image: qyg2297248353/bili-fetcher:v1.6.7 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.6 + image: qyg2297248353/bili-fetcher-web:v1.6.7 labels: createdBy: Apps networks: diff --git a/dockge/deeplx/docker-compose.yml b/dockge/deeplx/docker-compose.yml index c27a767ad..fe7864ca7 100644 --- a/dockge/deeplx/docker-compose.yml +++ b/dockge/deeplx/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - PORT=1188 - image: qyg2297248353/deeplx:v1.0.8.1 + image: qyg2297248353/deeplx:v1.0.9.1 labels: createdBy: Apps networks: From 12d42dcc04d7a92f39bc82487af710ce2b34d857 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 06:36:03 +0000 Subject: [PATCH 008/262] Update 1dev/server Docker tag to v13.0.8 --- apps/onedev/13.0.7/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/onedev/13.0.7/docker-compose.yml b/apps/onedev/13.0.7/docker-compose.yml index 2db7f9d19..28c9c2a81 100644 --- a/apps/onedev/13.0.7/docker-compose.yml +++ b/apps/onedev/13.0.7/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: onedev: - image: 1dev/server:13.0.7 + image: 1dev/server:13.0.8 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 0985cd03e51517c1aa31edf83e84c8fb6e9ff7e2 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 06:36:13 +0000 Subject: [PATCH 009/262] Update app version [skip ci] --- apps/onedev/{13.0.7 => 13.0.8}/data.yml | 0 apps/onedev/{13.0.7 => 13.0.8}/docker-compose.yml | 0 apps/onedev/{13.0.7 => 13.0.8}/envs/default.env | 0 apps/onedev/{13.0.7 => 13.0.8}/envs/global.env | 0 apps/onedev/{13.0.7 => 13.0.8}/envs/onedev.env | 0 apps/onedev/{13.0.7 => 13.0.8}/scripts/init.sh | 0 apps/onedev/{13.0.7 => 13.0.8}/scripts/uninstall.sh | 0 apps/onedev/{13.0.7 => 13.0.8}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/onedev/{13.0.7 => 13.0.8}/data.yml (100%) rename apps/onedev/{13.0.7 => 13.0.8}/docker-compose.yml (100%) rename apps/onedev/{13.0.7 => 13.0.8}/envs/default.env (100%) rename apps/onedev/{13.0.7 => 13.0.8}/envs/global.env (100%) rename apps/onedev/{13.0.7 => 13.0.8}/envs/onedev.env (100%) rename apps/onedev/{13.0.7 => 13.0.8}/scripts/init.sh (100%) rename apps/onedev/{13.0.7 => 13.0.8}/scripts/uninstall.sh (100%) rename apps/onedev/{13.0.7 => 13.0.8}/scripts/upgrade.sh (100%) diff --git a/apps/onedev/13.0.7/data.yml b/apps/onedev/13.0.8/data.yml similarity index 100% rename from apps/onedev/13.0.7/data.yml rename to apps/onedev/13.0.8/data.yml diff --git a/apps/onedev/13.0.7/docker-compose.yml b/apps/onedev/13.0.8/docker-compose.yml similarity index 100% rename from apps/onedev/13.0.7/docker-compose.yml rename to apps/onedev/13.0.8/docker-compose.yml diff --git a/apps/onedev/13.0.7/envs/default.env b/apps/onedev/13.0.8/envs/default.env similarity index 100% rename from apps/onedev/13.0.7/envs/default.env rename to apps/onedev/13.0.8/envs/default.env diff --git a/apps/onedev/13.0.7/envs/global.env b/apps/onedev/13.0.8/envs/global.env similarity index 100% rename from apps/onedev/13.0.7/envs/global.env rename to apps/onedev/13.0.8/envs/global.env diff --git a/apps/onedev/13.0.7/envs/onedev.env b/apps/onedev/13.0.8/envs/onedev.env similarity index 100% rename from apps/onedev/13.0.7/envs/onedev.env rename to apps/onedev/13.0.8/envs/onedev.env diff --git a/apps/onedev/13.0.7/scripts/init.sh b/apps/onedev/13.0.8/scripts/init.sh similarity index 100% rename from apps/onedev/13.0.7/scripts/init.sh rename to apps/onedev/13.0.8/scripts/init.sh diff --git a/apps/onedev/13.0.7/scripts/uninstall.sh b/apps/onedev/13.0.8/scripts/uninstall.sh similarity index 100% rename from apps/onedev/13.0.7/scripts/uninstall.sh rename to apps/onedev/13.0.8/scripts/uninstall.sh diff --git a/apps/onedev/13.0.7/scripts/upgrade.sh b/apps/onedev/13.0.8/scripts/upgrade.sh similarity index 100% rename from apps/onedev/13.0.7/scripts/upgrade.sh rename to apps/onedev/13.0.8/scripts/upgrade.sh From 099f6b7a602a9c398ba431ac6c4e49c3aa17ed13 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 09:22:48 +0000 Subject: [PATCH 010/262] Processed apps directory via GitHub Actions --- appstore/onedev/{13.0.7 => 13.0.8}/.env | 0 appstore/onedev/{13.0.7 => 13.0.8}/data.yml | 0 appstore/onedev/{13.0.7 => 13.0.8}/docker-compose.yml | 2 +- appstore/onedev/{13.0.7 => 13.0.8}/envs/default.env | 0 appstore/onedev/{13.0.7 => 13.0.8}/envs/global.env | 0 appstore/onedev/{13.0.7 => 13.0.8}/envs/onedev.env | 0 appstore/onedev/{13.0.7 => 13.0.8}/scripts/init.sh | 0 appstore/onedev/{13.0.7 => 13.0.8}/scripts/uninstall.sh | 0 appstore/onedev/{13.0.7 => 13.0.8}/scripts/upgrade.sh | 0 dockge/onedev/docker-compose.yml | 2 +- 10 files changed, 2 insertions(+), 2 deletions(-) rename appstore/onedev/{13.0.7 => 13.0.8}/.env (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/data.yml (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/docker-compose.yml (95%) rename appstore/onedev/{13.0.7 => 13.0.8}/envs/default.env (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/envs/global.env (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/envs/onedev.env (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/scripts/init.sh (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/scripts/uninstall.sh (100%) rename appstore/onedev/{13.0.7 => 13.0.8}/scripts/upgrade.sh (100%) diff --git a/appstore/onedev/13.0.7/.env b/appstore/onedev/13.0.8/.env similarity index 100% rename from appstore/onedev/13.0.7/.env rename to appstore/onedev/13.0.8/.env diff --git a/appstore/onedev/13.0.7/data.yml b/appstore/onedev/13.0.8/data.yml similarity index 100% rename from appstore/onedev/13.0.7/data.yml rename to appstore/onedev/13.0.8/data.yml diff --git a/appstore/onedev/13.0.7/docker-compose.yml b/appstore/onedev/13.0.8/docker-compose.yml similarity index 95% rename from appstore/onedev/13.0.7/docker-compose.yml rename to appstore/onedev/13.0.8/docker-compose.yml index 0de03ce27..78baeb211 100644 --- a/appstore/onedev/13.0.7/docker-compose.yml +++ b/appstore/onedev/13.0.8/docker-compose.yml @@ -14,7 +14,7 @@ services: - initial_email=${INITIAL_EMAIL} - initial_server_url=${INITIAL_SERVER_URL} - initial_ssh_root_url=${INITIAL_SSH_ROOT_URL} - image: 1dev/server:13.0.7 + image: 1dev/server:13.0.8 labels: createdBy: Apps networks: diff --git a/appstore/onedev/13.0.7/envs/default.env b/appstore/onedev/13.0.8/envs/default.env similarity index 100% rename from appstore/onedev/13.0.7/envs/default.env rename to appstore/onedev/13.0.8/envs/default.env diff --git a/appstore/onedev/13.0.7/envs/global.env b/appstore/onedev/13.0.8/envs/global.env similarity index 100% rename from appstore/onedev/13.0.7/envs/global.env rename to appstore/onedev/13.0.8/envs/global.env diff --git a/appstore/onedev/13.0.7/envs/onedev.env b/appstore/onedev/13.0.8/envs/onedev.env similarity index 100% rename from appstore/onedev/13.0.7/envs/onedev.env rename to appstore/onedev/13.0.8/envs/onedev.env diff --git a/appstore/onedev/13.0.7/scripts/init.sh b/appstore/onedev/13.0.8/scripts/init.sh similarity index 100% rename from appstore/onedev/13.0.7/scripts/init.sh rename to appstore/onedev/13.0.8/scripts/init.sh diff --git a/appstore/onedev/13.0.7/scripts/uninstall.sh b/appstore/onedev/13.0.8/scripts/uninstall.sh similarity index 100% rename from appstore/onedev/13.0.7/scripts/uninstall.sh rename to appstore/onedev/13.0.8/scripts/uninstall.sh diff --git a/appstore/onedev/13.0.7/scripts/upgrade.sh b/appstore/onedev/13.0.8/scripts/upgrade.sh similarity index 100% rename from appstore/onedev/13.0.7/scripts/upgrade.sh rename to appstore/onedev/13.0.8/scripts/upgrade.sh diff --git a/dockge/onedev/docker-compose.yml b/dockge/onedev/docker-compose.yml index 0de03ce27..78baeb211 100644 --- a/dockge/onedev/docker-compose.yml +++ b/dockge/onedev/docker-compose.yml @@ -14,7 +14,7 @@ services: - initial_email=${INITIAL_EMAIL} - initial_server_url=${INITIAL_SERVER_URL} - initial_ssh_root_url=${INITIAL_SSH_ROOT_URL} - image: 1dev/server:13.0.7 + image: 1dev/server:13.0.8 labels: createdBy: Apps networks: From aea0ec6410c9b181ba84d9fd1c851f013b58a727 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:17:21 +0000 Subject: [PATCH 011/262] Update wushuo894/ani-rss Docker tag to v2.2.13 --- apps/ani-rss/2.2.12/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/2.2.12/docker-compose.yml b/apps/ani-rss/2.2.12/docker-compose.yml index b8dc16727..f2a61a760 100644 --- a/apps/ani-rss/2.2.12/docker-compose.yml +++ b/apps/ani-rss/2.2.12/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.2.12 + image: wushuo894/ani-rss:v2.2.13 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 36ba4de1fc5dba954d9b4c0d2f3c11e2072f3e85 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 10:17:36 +0000 Subject: [PATCH 012/262] Update app version [skip ci] --- apps/ani-rss/{2.2.12 => 2.2.13}/data.yml | 0 apps/ani-rss/{2.2.12 => 2.2.13}/docker-compose.yml | 0 apps/ani-rss/{2.2.12 => 2.2.13}/envs/default.env | 0 apps/ani-rss/{2.2.12 => 2.2.13}/envs/global.env | 0 apps/ani-rss/{2.2.12 => 2.2.13}/scripts/init.sh | 0 apps/ani-rss/{2.2.12 => 2.2.13}/scripts/uninstall.sh | 0 apps/ani-rss/{2.2.12 => 2.2.13}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{2.2.12 => 2.2.13}/data.yml (100%) rename apps/ani-rss/{2.2.12 => 2.2.13}/docker-compose.yml (100%) rename apps/ani-rss/{2.2.12 => 2.2.13}/envs/default.env (100%) rename apps/ani-rss/{2.2.12 => 2.2.13}/envs/global.env (100%) rename apps/ani-rss/{2.2.12 => 2.2.13}/scripts/init.sh (100%) rename apps/ani-rss/{2.2.12 => 2.2.13}/scripts/uninstall.sh (100%) rename apps/ani-rss/{2.2.12 => 2.2.13}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/2.2.12/data.yml b/apps/ani-rss/2.2.13/data.yml similarity index 100% rename from apps/ani-rss/2.2.12/data.yml rename to apps/ani-rss/2.2.13/data.yml diff --git a/apps/ani-rss/2.2.12/docker-compose.yml b/apps/ani-rss/2.2.13/docker-compose.yml similarity index 100% rename from apps/ani-rss/2.2.12/docker-compose.yml rename to apps/ani-rss/2.2.13/docker-compose.yml diff --git a/apps/ani-rss/2.2.12/envs/default.env b/apps/ani-rss/2.2.13/envs/default.env similarity index 100% rename from apps/ani-rss/2.2.12/envs/default.env rename to apps/ani-rss/2.2.13/envs/default.env diff --git a/apps/ani-rss/2.2.12/envs/global.env b/apps/ani-rss/2.2.13/envs/global.env similarity index 100% rename from apps/ani-rss/2.2.12/envs/global.env rename to apps/ani-rss/2.2.13/envs/global.env diff --git a/apps/ani-rss/2.2.12/scripts/init.sh b/apps/ani-rss/2.2.13/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.2.12/scripts/init.sh rename to apps/ani-rss/2.2.13/scripts/init.sh diff --git a/apps/ani-rss/2.2.12/scripts/uninstall.sh b/apps/ani-rss/2.2.13/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.2.12/scripts/uninstall.sh rename to apps/ani-rss/2.2.13/scripts/uninstall.sh diff --git a/apps/ani-rss/2.2.12/scripts/upgrade.sh b/apps/ani-rss/2.2.13/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.2.12/scripts/upgrade.sh rename to apps/ani-rss/2.2.13/scripts/upgrade.sh From 1e13448e9665a2ff7d3fa081325884241a4ad16d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:16:53 +0000 Subject: [PATCH 013/262] Update ghcr.io/nezhahq/nezha Docker tag to v1.14.6 --- apps/nezha/1.14.5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha/1.14.5/docker-compose.yml b/apps/nezha/1.14.5/docker-compose.yml index e2c7f1f87..5dd1599be 100644 --- a/apps/nezha/1.14.5/docker-compose.yml +++ b/apps/nezha/1.14.5/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha: - image: ghcr.io/nezhahq/nezha:v1.14.5 + image: ghcr.io/nezhahq/nezha:v1.14.6 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 764f71517b3db069cf324da78b2d54cfc065dc9f Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 11:17:05 +0000 Subject: [PATCH 014/262] Update app version [skip ci] --- apps/nezha/{1.14.5 => 1.14.6}/data.yml | 0 apps/nezha/{1.14.5 => 1.14.6}/data/config-example.yaml | 0 apps/nezha/{1.14.5 => 1.14.6}/docker-compose.yml | 0 apps/nezha/{1.14.5 => 1.14.6}/envs/default.env | 0 apps/nezha/{1.14.5 => 1.14.6}/envs/global.env | 0 apps/nezha/{1.14.5 => 1.14.6}/scripts/init.sh | 0 apps/nezha/{1.14.5 => 1.14.6}/scripts/uninstall.sh | 0 apps/nezha/{1.14.5 => 1.14.6}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha/{1.14.5 => 1.14.6}/data.yml (100%) rename apps/nezha/{1.14.5 => 1.14.6}/data/config-example.yaml (100%) rename apps/nezha/{1.14.5 => 1.14.6}/docker-compose.yml (100%) rename apps/nezha/{1.14.5 => 1.14.6}/envs/default.env (100%) rename apps/nezha/{1.14.5 => 1.14.6}/envs/global.env (100%) rename apps/nezha/{1.14.5 => 1.14.6}/scripts/init.sh (100%) rename apps/nezha/{1.14.5 => 1.14.6}/scripts/uninstall.sh (100%) rename apps/nezha/{1.14.5 => 1.14.6}/scripts/upgrade.sh (100%) diff --git a/apps/nezha/1.14.5/data.yml b/apps/nezha/1.14.6/data.yml similarity index 100% rename from apps/nezha/1.14.5/data.yml rename to apps/nezha/1.14.6/data.yml diff --git a/apps/nezha/1.14.5/data/config-example.yaml b/apps/nezha/1.14.6/data/config-example.yaml similarity index 100% rename from apps/nezha/1.14.5/data/config-example.yaml rename to apps/nezha/1.14.6/data/config-example.yaml diff --git a/apps/nezha/1.14.5/docker-compose.yml b/apps/nezha/1.14.6/docker-compose.yml similarity index 100% rename from apps/nezha/1.14.5/docker-compose.yml rename to apps/nezha/1.14.6/docker-compose.yml diff --git a/apps/nezha/1.14.5/envs/default.env b/apps/nezha/1.14.6/envs/default.env similarity index 100% rename from apps/nezha/1.14.5/envs/default.env rename to apps/nezha/1.14.6/envs/default.env diff --git a/apps/nezha/1.14.5/envs/global.env b/apps/nezha/1.14.6/envs/global.env similarity index 100% rename from apps/nezha/1.14.5/envs/global.env rename to apps/nezha/1.14.6/envs/global.env diff --git a/apps/nezha/1.14.5/scripts/init.sh b/apps/nezha/1.14.6/scripts/init.sh similarity index 100% rename from apps/nezha/1.14.5/scripts/init.sh rename to apps/nezha/1.14.6/scripts/init.sh diff --git a/apps/nezha/1.14.5/scripts/uninstall.sh b/apps/nezha/1.14.6/scripts/uninstall.sh similarity index 100% rename from apps/nezha/1.14.5/scripts/uninstall.sh rename to apps/nezha/1.14.6/scripts/uninstall.sh diff --git a/apps/nezha/1.14.5/scripts/upgrade.sh b/apps/nezha/1.14.6/scripts/upgrade.sh similarity index 100% rename from apps/nezha/1.14.5/scripts/upgrade.sh rename to apps/nezha/1.14.6/scripts/upgrade.sh From b964ad598ac0adba0d27caf86bda6887e6b49b3a Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 12:44:40 +0000 Subject: [PATCH 015/262] Processed apps directory via GitHub Actions --- appstore/ani-rss/{2.2.12 => 2.2.13}/.env | 0 appstore/ani-rss/{2.2.12 => 2.2.13}/data.yml | 0 appstore/ani-rss/{2.2.12 => 2.2.13}/docker-compose.yml | 2 +- appstore/ani-rss/{2.2.12 => 2.2.13}/envs/default.env | 0 appstore/ani-rss/{2.2.12 => 2.2.13}/envs/global.env | 0 appstore/ani-rss/{2.2.12 => 2.2.13}/scripts/init.sh | 0 appstore/ani-rss/{2.2.12 => 2.2.13}/scripts/uninstall.sh | 0 appstore/ani-rss/{2.2.12 => 2.2.13}/scripts/upgrade.sh | 0 appstore/nezha/{1.14.5 => 1.14.6}/.env | 0 appstore/nezha/{1.14.5 => 1.14.6}/data.yml | 0 appstore/nezha/{1.14.5 => 1.14.6}/data/config-example.yaml | 0 appstore/nezha/{1.14.5 => 1.14.6}/docker-compose.yml | 2 +- appstore/nezha/{1.14.5 => 1.14.6}/envs/default.env | 0 appstore/nezha/{1.14.5 => 1.14.6}/envs/global.env | 0 appstore/nezha/{1.14.5 => 1.14.6}/scripts/init.sh | 0 appstore/nezha/{1.14.5 => 1.14.6}/scripts/uninstall.sh | 0 appstore/nezha/{1.14.5 => 1.14.6}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 5 ++++- dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/.env | 0 dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/docker-compose.yml | 5 +---- dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/envs/default.env | 0 dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/envs/global.env | 0 dockge/nezha/docker-compose.yml | 2 +- 23 files changed, 8 insertions(+), 8 deletions(-) rename appstore/ani-rss/{2.2.12 => 2.2.13}/.env (100%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/data.yml (100%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/docker-compose.yml (95%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/envs/default.env (100%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/envs/global.env (100%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/scripts/init.sh (100%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.2.12 => 2.2.13}/scripts/upgrade.sh (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/.env (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/data.yml (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/data/config-example.yaml (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/docker-compose.yml (90%) rename appstore/nezha/{1.14.5 => 1.14.6}/envs/default.env (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/envs/global.env (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/scripts/init.sh (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/scripts/uninstall.sh (100%) rename appstore/nezha/{1.14.5 => 1.14.6}/scripts/upgrade.sh (100%) rename dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/.env (100%) rename dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/docker-compose.yml (90%) rename dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/envs/default.env (100%) rename dockge/{ani-rss_2_2_12 => ani-rss_1_2_82}/envs/global.env (100%) diff --git a/appstore/ani-rss/2.2.12/.env b/appstore/ani-rss/2.2.13/.env similarity index 100% rename from appstore/ani-rss/2.2.12/.env rename to appstore/ani-rss/2.2.13/.env diff --git a/appstore/ani-rss/2.2.12/data.yml b/appstore/ani-rss/2.2.13/data.yml similarity index 100% rename from appstore/ani-rss/2.2.12/data.yml rename to appstore/ani-rss/2.2.13/data.yml diff --git a/appstore/ani-rss/2.2.12/docker-compose.yml b/appstore/ani-rss/2.2.13/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.2.12/docker-compose.yml rename to appstore/ani-rss/2.2.13/docker-compose.yml index 3cbbf646f..f36733072 100644 --- a/appstore/ani-rss/2.2.12/docker-compose.yml +++ b/appstore/ani-rss/2.2.13/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.12 + image: wushuo894/ani-rss:v2.2.13 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/2.2.12/envs/default.env b/appstore/ani-rss/2.2.13/envs/default.env similarity index 100% rename from appstore/ani-rss/2.2.12/envs/default.env rename to appstore/ani-rss/2.2.13/envs/default.env diff --git a/appstore/ani-rss/2.2.12/envs/global.env b/appstore/ani-rss/2.2.13/envs/global.env similarity index 100% rename from appstore/ani-rss/2.2.12/envs/global.env rename to appstore/ani-rss/2.2.13/envs/global.env diff --git a/appstore/ani-rss/2.2.12/scripts/init.sh b/appstore/ani-rss/2.2.13/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.2.12/scripts/init.sh rename to appstore/ani-rss/2.2.13/scripts/init.sh diff --git a/appstore/ani-rss/2.2.12/scripts/uninstall.sh b/appstore/ani-rss/2.2.13/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.2.12/scripts/uninstall.sh rename to appstore/ani-rss/2.2.13/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.2.12/scripts/upgrade.sh b/appstore/ani-rss/2.2.13/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.2.12/scripts/upgrade.sh rename to appstore/ani-rss/2.2.13/scripts/upgrade.sh diff --git a/appstore/nezha/1.14.5/.env b/appstore/nezha/1.14.6/.env similarity index 100% rename from appstore/nezha/1.14.5/.env rename to appstore/nezha/1.14.6/.env diff --git a/appstore/nezha/1.14.5/data.yml b/appstore/nezha/1.14.6/data.yml similarity index 100% rename from appstore/nezha/1.14.5/data.yml rename to appstore/nezha/1.14.6/data.yml diff --git a/appstore/nezha/1.14.5/data/config-example.yaml b/appstore/nezha/1.14.6/data/config-example.yaml similarity index 100% rename from appstore/nezha/1.14.5/data/config-example.yaml rename to appstore/nezha/1.14.6/data/config-example.yaml diff --git a/appstore/nezha/1.14.5/docker-compose.yml b/appstore/nezha/1.14.6/docker-compose.yml similarity index 90% rename from appstore/nezha/1.14.5/docker-compose.yml rename to appstore/nezha/1.14.6/docker-compose.yml index 32273b3e9..13406bd12 100644 --- a/appstore/nezha/1.14.5/docker-compose.yml +++ b/appstore/nezha/1.14.6/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.5 + image: ghcr.io/nezhahq/nezha:v1.14.6 labels: createdBy: Apps networks: diff --git a/appstore/nezha/1.14.5/envs/default.env b/appstore/nezha/1.14.6/envs/default.env similarity index 100% rename from appstore/nezha/1.14.5/envs/default.env rename to appstore/nezha/1.14.6/envs/default.env diff --git a/appstore/nezha/1.14.5/envs/global.env b/appstore/nezha/1.14.6/envs/global.env similarity index 100% rename from appstore/nezha/1.14.5/envs/global.env rename to appstore/nezha/1.14.6/envs/global.env diff --git a/appstore/nezha/1.14.5/scripts/init.sh b/appstore/nezha/1.14.6/scripts/init.sh similarity index 100% rename from appstore/nezha/1.14.5/scripts/init.sh rename to appstore/nezha/1.14.6/scripts/init.sh diff --git a/appstore/nezha/1.14.5/scripts/uninstall.sh b/appstore/nezha/1.14.6/scripts/uninstall.sh similarity index 100% rename from appstore/nezha/1.14.5/scripts/uninstall.sh rename to appstore/nezha/1.14.6/scripts/uninstall.sh diff --git a/appstore/nezha/1.14.5/scripts/upgrade.sh b/appstore/nezha/1.14.6/scripts/upgrade.sh similarity index 100% rename from appstore/nezha/1.14.5/scripts/upgrade.sh rename to appstore/nezha/1.14.6/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 9c6e13c66..f36733072 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -8,10 +8,13 @@ services: - ./envs/global.env - .env environment: + - PUID=0 + - PGID=0 + - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.82 + image: wushuo894/ani-rss:v2.2.13 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_2_2_12/.env b/dockge/ani-rss_1_2_82/.env similarity index 100% rename from dockge/ani-rss_2_2_12/.env rename to dockge/ani-rss_1_2_82/.env diff --git a/dockge/ani-rss_2_2_12/docker-compose.yml b/dockge/ani-rss_1_2_82/docker-compose.yml similarity index 90% rename from dockge/ani-rss_2_2_12/docker-compose.yml rename to dockge/ani-rss_1_2_82/docker-compose.yml index 3cbbf646f..9c6e13c66 100644 --- a/dockge/ani-rss_2_2_12/docker-compose.yml +++ b/dockge/ani-rss_1_2_82/docker-compose.yml @@ -8,13 +8,10 @@ services: - ./envs/global.env - .env environment: - - PUID=0 - - PGID=0 - - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.12 + image: wushuo894/ani-rss:v1.2.82 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_2_2_12/envs/default.env b/dockge/ani-rss_1_2_82/envs/default.env similarity index 100% rename from dockge/ani-rss_2_2_12/envs/default.env rename to dockge/ani-rss_1_2_82/envs/default.env diff --git a/dockge/ani-rss_2_2_12/envs/global.env b/dockge/ani-rss_1_2_82/envs/global.env similarity index 100% rename from dockge/ani-rss_2_2_12/envs/global.env rename to dockge/ani-rss_1_2_82/envs/global.env diff --git a/dockge/nezha/docker-compose.yml b/dockge/nezha/docker-compose.yml index 32273b3e9..13406bd12 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/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.5 + image: ghcr.io/nezhahq/nezha:v1.14.6 labels: createdBy: Apps networks: From 8e835917e50eaf90917e466f062fe6fc9b1122d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 13:28:39 +0000 Subject: [PATCH 016/262] Update sn0wl1n/ech0 Docker tag to v2.7.6 --- apps/ech0/2.7.5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.7.5/docker-compose.yml b/apps/ech0/2.7.5/docker-compose.yml index 1428ee616..bdeb53ba5 100644 --- a/apps/ech0/2.7.5/docker-compose.yml +++ b/apps/ech0/2.7.5/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.7.5 + image: sn0wl1n/ech0:v2.7.6 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 603ec2563f37a64de62fe99126ec1cb4f6817066 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 13:28:50 +0000 Subject: [PATCH 017/262] Update app version [skip ci] --- apps/ech0/{2.7.5 => 2.7.6}/data.yml | 0 apps/ech0/{2.7.5 => 2.7.6}/docker-compose.yml | 0 apps/ech0/{2.7.5 => 2.7.6}/envs/default.env | 0 apps/ech0/{2.7.5 => 2.7.6}/envs/global.env | 0 apps/ech0/{2.7.5 => 2.7.6}/scripts/init.sh | 0 apps/ech0/{2.7.5 => 2.7.6}/scripts/uninstall.sh | 0 apps/ech0/{2.7.5 => 2.7.6}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.7.5 => 2.7.6}/data.yml (100%) rename apps/ech0/{2.7.5 => 2.7.6}/docker-compose.yml (100%) rename apps/ech0/{2.7.5 => 2.7.6}/envs/default.env (100%) rename apps/ech0/{2.7.5 => 2.7.6}/envs/global.env (100%) rename apps/ech0/{2.7.5 => 2.7.6}/scripts/init.sh (100%) rename apps/ech0/{2.7.5 => 2.7.6}/scripts/uninstall.sh (100%) rename apps/ech0/{2.7.5 => 2.7.6}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.7.5/data.yml b/apps/ech0/2.7.6/data.yml similarity index 100% rename from apps/ech0/2.7.5/data.yml rename to apps/ech0/2.7.6/data.yml diff --git a/apps/ech0/2.7.5/docker-compose.yml b/apps/ech0/2.7.6/docker-compose.yml similarity index 100% rename from apps/ech0/2.7.5/docker-compose.yml rename to apps/ech0/2.7.6/docker-compose.yml diff --git a/apps/ech0/2.7.5/envs/default.env b/apps/ech0/2.7.6/envs/default.env similarity index 100% rename from apps/ech0/2.7.5/envs/default.env rename to apps/ech0/2.7.6/envs/default.env diff --git a/apps/ech0/2.7.5/envs/global.env b/apps/ech0/2.7.6/envs/global.env similarity index 100% rename from apps/ech0/2.7.5/envs/global.env rename to apps/ech0/2.7.6/envs/global.env diff --git a/apps/ech0/2.7.5/scripts/init.sh b/apps/ech0/2.7.6/scripts/init.sh similarity index 100% rename from apps/ech0/2.7.5/scripts/init.sh rename to apps/ech0/2.7.6/scripts/init.sh diff --git a/apps/ech0/2.7.5/scripts/uninstall.sh b/apps/ech0/2.7.6/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.7.5/scripts/uninstall.sh rename to apps/ech0/2.7.6/scripts/uninstall.sh diff --git a/apps/ech0/2.7.5/scripts/upgrade.sh b/apps/ech0/2.7.6/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.7.5/scripts/upgrade.sh rename to apps/ech0/2.7.6/scripts/upgrade.sh From 5cede07f6d19230153dde0f089a6f21bea0e9449 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 14:15:56 +0000 Subject: [PATCH 018/262] Update ghcr.io/nezhahq/nezha Docker tag to v1.14.7 --- apps/nezha/1.14.6/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha/1.14.6/docker-compose.yml b/apps/nezha/1.14.6/docker-compose.yml index 5dd1599be..0c6c7f19c 100644 --- a/apps/nezha/1.14.6/docker-compose.yml +++ b/apps/nezha/1.14.6/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha: - image: ghcr.io/nezhahq/nezha:v1.14.6 + image: ghcr.io/nezhahq/nezha:v1.14.7 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 94c15513ab91edbd1d93591eaa3618568431c66e Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 14:16:11 +0000 Subject: [PATCH 019/262] Update app version [skip ci] --- apps/nezha/{1.14.6 => 1.14.7}/data.yml | 0 apps/nezha/{1.14.6 => 1.14.7}/data/config-example.yaml | 0 apps/nezha/{1.14.6 => 1.14.7}/docker-compose.yml | 0 apps/nezha/{1.14.6 => 1.14.7}/envs/default.env | 0 apps/nezha/{1.14.6 => 1.14.7}/envs/global.env | 0 apps/nezha/{1.14.6 => 1.14.7}/scripts/init.sh | 0 apps/nezha/{1.14.6 => 1.14.7}/scripts/uninstall.sh | 0 apps/nezha/{1.14.6 => 1.14.7}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha/{1.14.6 => 1.14.7}/data.yml (100%) rename apps/nezha/{1.14.6 => 1.14.7}/data/config-example.yaml (100%) rename apps/nezha/{1.14.6 => 1.14.7}/docker-compose.yml (100%) rename apps/nezha/{1.14.6 => 1.14.7}/envs/default.env (100%) rename apps/nezha/{1.14.6 => 1.14.7}/envs/global.env (100%) rename apps/nezha/{1.14.6 => 1.14.7}/scripts/init.sh (100%) rename apps/nezha/{1.14.6 => 1.14.7}/scripts/uninstall.sh (100%) rename apps/nezha/{1.14.6 => 1.14.7}/scripts/upgrade.sh (100%) diff --git a/apps/nezha/1.14.6/data.yml b/apps/nezha/1.14.7/data.yml similarity index 100% rename from apps/nezha/1.14.6/data.yml rename to apps/nezha/1.14.7/data.yml diff --git a/apps/nezha/1.14.6/data/config-example.yaml b/apps/nezha/1.14.7/data/config-example.yaml similarity index 100% rename from apps/nezha/1.14.6/data/config-example.yaml rename to apps/nezha/1.14.7/data/config-example.yaml diff --git a/apps/nezha/1.14.6/docker-compose.yml b/apps/nezha/1.14.7/docker-compose.yml similarity index 100% rename from apps/nezha/1.14.6/docker-compose.yml rename to apps/nezha/1.14.7/docker-compose.yml diff --git a/apps/nezha/1.14.6/envs/default.env b/apps/nezha/1.14.7/envs/default.env similarity index 100% rename from apps/nezha/1.14.6/envs/default.env rename to apps/nezha/1.14.7/envs/default.env diff --git a/apps/nezha/1.14.6/envs/global.env b/apps/nezha/1.14.7/envs/global.env similarity index 100% rename from apps/nezha/1.14.6/envs/global.env rename to apps/nezha/1.14.7/envs/global.env diff --git a/apps/nezha/1.14.6/scripts/init.sh b/apps/nezha/1.14.7/scripts/init.sh similarity index 100% rename from apps/nezha/1.14.6/scripts/init.sh rename to apps/nezha/1.14.7/scripts/init.sh diff --git a/apps/nezha/1.14.6/scripts/uninstall.sh b/apps/nezha/1.14.7/scripts/uninstall.sh similarity index 100% rename from apps/nezha/1.14.6/scripts/uninstall.sh rename to apps/nezha/1.14.7/scripts/uninstall.sh diff --git a/apps/nezha/1.14.6/scripts/upgrade.sh b/apps/nezha/1.14.7/scripts/upgrade.sh similarity index 100% rename from apps/nezha/1.14.6/scripts/upgrade.sh rename to apps/nezha/1.14.7/scripts/upgrade.sh From 075ecfe1e4356706736e016629c6dfbed4903398 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 15:30:28 +0000 Subject: [PATCH 020/262] Processed apps directory via GitHub Actions --- appstore/ech0/{2.7.5 => 2.7.6}/.env | 0 appstore/ech0/{2.7.5 => 2.7.6}/data.yml | 0 appstore/ech0/{2.7.5 => 2.7.6}/docker-compose.yml | 2 +- appstore/ech0/{2.7.5 => 2.7.6}/envs/default.env | 0 appstore/ech0/{2.7.5 => 2.7.6}/envs/global.env | 0 appstore/ech0/{2.7.5 => 2.7.6}/scripts/init.sh | 0 appstore/ech0/{2.7.5 => 2.7.6}/scripts/uninstall.sh | 0 appstore/ech0/{2.7.5 => 2.7.6}/scripts/upgrade.sh | 0 appstore/nezha/{1.14.6 => 1.14.7}/.env | 0 appstore/nezha/{1.14.6 => 1.14.7}/data.yml | 0 appstore/nezha/{1.14.6 => 1.14.7}/data/config-example.yaml | 0 appstore/nezha/{1.14.6 => 1.14.7}/docker-compose.yml | 2 +- appstore/nezha/{1.14.6 => 1.14.7}/envs/default.env | 0 appstore/nezha/{1.14.6 => 1.14.7}/envs/global.env | 0 appstore/nezha/{1.14.6 => 1.14.7}/scripts/init.sh | 0 appstore/nezha/{1.14.6 => 1.14.7}/scripts/uninstall.sh | 0 appstore/nezha/{1.14.6 => 1.14.7}/scripts/upgrade.sh | 0 dockge/ech0/docker-compose.yml | 2 +- dockge/nezha/docker-compose.yml | 2 +- 19 files changed, 4 insertions(+), 4 deletions(-) rename appstore/ech0/{2.7.5 => 2.7.6}/.env (100%) rename appstore/ech0/{2.7.5 => 2.7.6}/data.yml (100%) rename appstore/ech0/{2.7.5 => 2.7.6}/docker-compose.yml (93%) rename appstore/ech0/{2.7.5 => 2.7.6}/envs/default.env (100%) rename appstore/ech0/{2.7.5 => 2.7.6}/envs/global.env (100%) rename appstore/ech0/{2.7.5 => 2.7.6}/scripts/init.sh (100%) rename appstore/ech0/{2.7.5 => 2.7.6}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.7.5 => 2.7.6}/scripts/upgrade.sh (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/.env (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/data.yml (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/data/config-example.yaml (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/docker-compose.yml (90%) rename appstore/nezha/{1.14.6 => 1.14.7}/envs/default.env (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/envs/global.env (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/scripts/init.sh (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/scripts/uninstall.sh (100%) rename appstore/nezha/{1.14.6 => 1.14.7}/scripts/upgrade.sh (100%) diff --git a/appstore/ech0/2.7.5/.env b/appstore/ech0/2.7.6/.env similarity index 100% rename from appstore/ech0/2.7.5/.env rename to appstore/ech0/2.7.6/.env diff --git a/appstore/ech0/2.7.5/data.yml b/appstore/ech0/2.7.6/data.yml similarity index 100% rename from appstore/ech0/2.7.5/data.yml rename to appstore/ech0/2.7.6/data.yml diff --git a/appstore/ech0/2.7.5/docker-compose.yml b/appstore/ech0/2.7.6/docker-compose.yml similarity index 93% rename from appstore/ech0/2.7.5/docker-compose.yml rename to appstore/ech0/2.7.6/docker-compose.yml index 648e436ef..a0ec11f18 100644 --- a/appstore/ech0/2.7.5/docker-compose.yml +++ b/appstore/ech0/2.7.6/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.5 + image: sn0wl1n/ech0:v2.7.6 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.7.5/envs/default.env b/appstore/ech0/2.7.6/envs/default.env similarity index 100% rename from appstore/ech0/2.7.5/envs/default.env rename to appstore/ech0/2.7.6/envs/default.env diff --git a/appstore/ech0/2.7.5/envs/global.env b/appstore/ech0/2.7.6/envs/global.env similarity index 100% rename from appstore/ech0/2.7.5/envs/global.env rename to appstore/ech0/2.7.6/envs/global.env diff --git a/appstore/ech0/2.7.5/scripts/init.sh b/appstore/ech0/2.7.6/scripts/init.sh similarity index 100% rename from appstore/ech0/2.7.5/scripts/init.sh rename to appstore/ech0/2.7.6/scripts/init.sh diff --git a/appstore/ech0/2.7.5/scripts/uninstall.sh b/appstore/ech0/2.7.6/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.7.5/scripts/uninstall.sh rename to appstore/ech0/2.7.6/scripts/uninstall.sh diff --git a/appstore/ech0/2.7.5/scripts/upgrade.sh b/appstore/ech0/2.7.6/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.7.5/scripts/upgrade.sh rename to appstore/ech0/2.7.6/scripts/upgrade.sh diff --git a/appstore/nezha/1.14.6/.env b/appstore/nezha/1.14.7/.env similarity index 100% rename from appstore/nezha/1.14.6/.env rename to appstore/nezha/1.14.7/.env diff --git a/appstore/nezha/1.14.6/data.yml b/appstore/nezha/1.14.7/data.yml similarity index 100% rename from appstore/nezha/1.14.6/data.yml rename to appstore/nezha/1.14.7/data.yml diff --git a/appstore/nezha/1.14.6/data/config-example.yaml b/appstore/nezha/1.14.7/data/config-example.yaml similarity index 100% rename from appstore/nezha/1.14.6/data/config-example.yaml rename to appstore/nezha/1.14.7/data/config-example.yaml diff --git a/appstore/nezha/1.14.6/docker-compose.yml b/appstore/nezha/1.14.7/docker-compose.yml similarity index 90% rename from appstore/nezha/1.14.6/docker-compose.yml rename to appstore/nezha/1.14.7/docker-compose.yml index 13406bd12..a9b6d0420 100644 --- a/appstore/nezha/1.14.6/docker-compose.yml +++ b/appstore/nezha/1.14.7/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.6 + image: ghcr.io/nezhahq/nezha:v1.14.7 labels: createdBy: Apps networks: diff --git a/appstore/nezha/1.14.6/envs/default.env b/appstore/nezha/1.14.7/envs/default.env similarity index 100% rename from appstore/nezha/1.14.6/envs/default.env rename to appstore/nezha/1.14.7/envs/default.env diff --git a/appstore/nezha/1.14.6/envs/global.env b/appstore/nezha/1.14.7/envs/global.env similarity index 100% rename from appstore/nezha/1.14.6/envs/global.env rename to appstore/nezha/1.14.7/envs/global.env diff --git a/appstore/nezha/1.14.6/scripts/init.sh b/appstore/nezha/1.14.7/scripts/init.sh similarity index 100% rename from appstore/nezha/1.14.6/scripts/init.sh rename to appstore/nezha/1.14.7/scripts/init.sh diff --git a/appstore/nezha/1.14.6/scripts/uninstall.sh b/appstore/nezha/1.14.7/scripts/uninstall.sh similarity index 100% rename from appstore/nezha/1.14.6/scripts/uninstall.sh rename to appstore/nezha/1.14.7/scripts/uninstall.sh diff --git a/appstore/nezha/1.14.6/scripts/upgrade.sh b/appstore/nezha/1.14.7/scripts/upgrade.sh similarity index 100% rename from appstore/nezha/1.14.6/scripts/upgrade.sh rename to appstore/nezha/1.14.7/scripts/upgrade.sh diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index 648e436ef..a0ec11f18 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.5 + image: sn0wl1n/ech0:v2.7.6 labels: createdBy: Apps networks: diff --git a/dockge/nezha/docker-compose.yml b/dockge/nezha/docker-compose.yml index 13406bd12..a9b6d0420 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/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.6 + image: ghcr.io/nezhahq/nezha:v1.14.7 labels: createdBy: Apps networks: From 5409b161e9ab0c4fdf64c08f460ce9de4c4760d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 15:47:11 +0000 Subject: [PATCH 021/262] Update ghcr.io/nezhahq/nezha Docker tag to v1.14.8 --- apps/nezha/1.14.7/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha/1.14.7/docker-compose.yml b/apps/nezha/1.14.7/docker-compose.yml index 0c6c7f19c..4860904e2 100644 --- a/apps/nezha/1.14.7/docker-compose.yml +++ b/apps/nezha/1.14.7/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha: - image: ghcr.io/nezhahq/nezha:v1.14.7 + image: ghcr.io/nezhahq/nezha:v1.14.8 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 7282c25a6d2b4afc34507067a3869df26352fac9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 15:47:16 +0000 Subject: [PATCH 022/262] Update casbin/casdoor Docker tag to v2.78.0 --- apps/casdoor/2.77.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.77.0/docker-compose.yml b/apps/casdoor/2.77.0/docker-compose.yml index 6fa956c88..02fd48991 100644 --- a/apps/casdoor/2.77.0/docker-compose.yml +++ b/apps/casdoor/2.77.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.77.0 + image: casbin/casdoor:v2.78.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From d2913c4f30bd58bb748ed9fc58e241679c6de40c Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 15:50:14 +0000 Subject: [PATCH 023/262] Update app version [skip ci] --- apps/casdoor/{2.77.0 => 2.78.0}/config/init_data.json | 0 apps/casdoor/{2.77.0 => 2.78.0}/data.yml | 0 apps/casdoor/{2.77.0 => 2.78.0}/docker-compose.yml | 0 apps/casdoor/{2.77.0 => 2.78.0}/envs/casdoor.env | 0 apps/casdoor/{2.77.0 => 2.78.0}/envs/default.env | 0 apps/casdoor/{2.77.0 => 2.78.0}/envs/global.env | 0 apps/casdoor/{2.77.0 => 2.78.0}/scripts/init.sh | 0 apps/casdoor/{2.77.0 => 2.78.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.77.0 => 2.78.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.77.0 => 2.78.0}/config/init_data.json (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/data.yml (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/docker-compose.yml (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/envs/default.env (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/envs/global.env (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/scripts/init.sh (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.77.0 => 2.78.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.77.0/config/init_data.json b/apps/casdoor/2.78.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.77.0/config/init_data.json rename to apps/casdoor/2.78.0/config/init_data.json diff --git a/apps/casdoor/2.77.0/data.yml b/apps/casdoor/2.78.0/data.yml similarity index 100% rename from apps/casdoor/2.77.0/data.yml rename to apps/casdoor/2.78.0/data.yml diff --git a/apps/casdoor/2.77.0/docker-compose.yml b/apps/casdoor/2.78.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.77.0/docker-compose.yml rename to apps/casdoor/2.78.0/docker-compose.yml diff --git a/apps/casdoor/2.77.0/envs/casdoor.env b/apps/casdoor/2.78.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.77.0/envs/casdoor.env rename to apps/casdoor/2.78.0/envs/casdoor.env diff --git a/apps/casdoor/2.77.0/envs/default.env b/apps/casdoor/2.78.0/envs/default.env similarity index 100% rename from apps/casdoor/2.77.0/envs/default.env rename to apps/casdoor/2.78.0/envs/default.env diff --git a/apps/casdoor/2.77.0/envs/global.env b/apps/casdoor/2.78.0/envs/global.env similarity index 100% rename from apps/casdoor/2.77.0/envs/global.env rename to apps/casdoor/2.78.0/envs/global.env diff --git a/apps/casdoor/2.77.0/scripts/init.sh b/apps/casdoor/2.78.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.77.0/scripts/init.sh rename to apps/casdoor/2.78.0/scripts/init.sh diff --git a/apps/casdoor/2.77.0/scripts/uninstall.sh b/apps/casdoor/2.78.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.77.0/scripts/uninstall.sh rename to apps/casdoor/2.78.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.77.0/scripts/upgrade.sh b/apps/casdoor/2.78.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.77.0/scripts/upgrade.sh rename to apps/casdoor/2.78.0/scripts/upgrade.sh From a083772d8ff8b9d9bfdf0010fe1b8cff0a8149e5 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 15:55:40 +0000 Subject: [PATCH 024/262] Update app version [skip ci] --- apps/nezha/{1.14.7 => 1.14.8}/data.yml | 0 apps/nezha/{1.14.7 => 1.14.8}/data/config-example.yaml | 0 apps/nezha/{1.14.7 => 1.14.8}/docker-compose.yml | 0 apps/nezha/{1.14.7 => 1.14.8}/envs/default.env | 0 apps/nezha/{1.14.7 => 1.14.8}/envs/global.env | 0 apps/nezha/{1.14.7 => 1.14.8}/scripts/init.sh | 0 apps/nezha/{1.14.7 => 1.14.8}/scripts/uninstall.sh | 0 apps/nezha/{1.14.7 => 1.14.8}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha/{1.14.7 => 1.14.8}/data.yml (100%) rename apps/nezha/{1.14.7 => 1.14.8}/data/config-example.yaml (100%) rename apps/nezha/{1.14.7 => 1.14.8}/docker-compose.yml (100%) rename apps/nezha/{1.14.7 => 1.14.8}/envs/default.env (100%) rename apps/nezha/{1.14.7 => 1.14.8}/envs/global.env (100%) rename apps/nezha/{1.14.7 => 1.14.8}/scripts/init.sh (100%) rename apps/nezha/{1.14.7 => 1.14.8}/scripts/uninstall.sh (100%) rename apps/nezha/{1.14.7 => 1.14.8}/scripts/upgrade.sh (100%) diff --git a/apps/nezha/1.14.7/data.yml b/apps/nezha/1.14.8/data.yml similarity index 100% rename from apps/nezha/1.14.7/data.yml rename to apps/nezha/1.14.8/data.yml diff --git a/apps/nezha/1.14.7/data/config-example.yaml b/apps/nezha/1.14.8/data/config-example.yaml similarity index 100% rename from apps/nezha/1.14.7/data/config-example.yaml rename to apps/nezha/1.14.8/data/config-example.yaml diff --git a/apps/nezha/1.14.7/docker-compose.yml b/apps/nezha/1.14.8/docker-compose.yml similarity index 100% rename from apps/nezha/1.14.7/docker-compose.yml rename to apps/nezha/1.14.8/docker-compose.yml diff --git a/apps/nezha/1.14.7/envs/default.env b/apps/nezha/1.14.8/envs/default.env similarity index 100% rename from apps/nezha/1.14.7/envs/default.env rename to apps/nezha/1.14.8/envs/default.env diff --git a/apps/nezha/1.14.7/envs/global.env b/apps/nezha/1.14.8/envs/global.env similarity index 100% rename from apps/nezha/1.14.7/envs/global.env rename to apps/nezha/1.14.8/envs/global.env diff --git a/apps/nezha/1.14.7/scripts/init.sh b/apps/nezha/1.14.8/scripts/init.sh similarity index 100% rename from apps/nezha/1.14.7/scripts/init.sh rename to apps/nezha/1.14.8/scripts/init.sh diff --git a/apps/nezha/1.14.7/scripts/uninstall.sh b/apps/nezha/1.14.8/scripts/uninstall.sh similarity index 100% rename from apps/nezha/1.14.7/scripts/uninstall.sh rename to apps/nezha/1.14.8/scripts/uninstall.sh diff --git a/apps/nezha/1.14.7/scripts/upgrade.sh b/apps/nezha/1.14.8/scripts/upgrade.sh similarity index 100% rename from apps/nezha/1.14.7/scripts/upgrade.sh rename to apps/nezha/1.14.8/scripts/upgrade.sh From 1634799655e3cb514cdbf27508312576d9bf8ad4 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 18:30:36 +0000 Subject: [PATCH 025/262] Processed apps directory via GitHub Actions --- appstore/casdoor/{2.77.0 => 2.78.0}/.env | 0 appstore/casdoor/{2.77.0 => 2.78.0}/config/init_data.json | 0 appstore/casdoor/{2.77.0 => 2.78.0}/data.yml | 0 appstore/casdoor/{2.77.0 => 2.78.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.77.0 => 2.78.0}/envs/casdoor.env | 0 appstore/casdoor/{2.77.0 => 2.78.0}/envs/default.env | 0 appstore/casdoor/{2.77.0 => 2.78.0}/envs/global.env | 0 appstore/casdoor/{2.77.0 => 2.78.0}/scripts/init.sh | 0 appstore/casdoor/{2.77.0 => 2.78.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.77.0 => 2.78.0}/scripts/upgrade.sh | 0 appstore/nezha/{1.14.7 => 1.14.8}/.env | 0 appstore/nezha/{1.14.7 => 1.14.8}/data.yml | 0 appstore/nezha/{1.14.7 => 1.14.8}/data/config-example.yaml | 0 appstore/nezha/{1.14.7 => 1.14.8}/docker-compose.yml | 2 +- appstore/nezha/{1.14.7 => 1.14.8}/envs/default.env | 0 appstore/nezha/{1.14.7 => 1.14.8}/envs/global.env | 0 appstore/nezha/{1.14.7 => 1.14.8}/scripts/init.sh | 0 appstore/nezha/{1.14.7 => 1.14.8}/scripts/uninstall.sh | 0 appstore/nezha/{1.14.7 => 1.14.8}/scripts/upgrade.sh | 0 dockge/casdoor/docker-compose.yml | 2 +- dockge/nezha/docker-compose.yml | 2 +- 21 files changed, 4 insertions(+), 4 deletions(-) rename appstore/casdoor/{2.77.0 => 2.78.0}/.env (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/config/init_data.json (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/data.yml (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.77.0 => 2.78.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/envs/default.env (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/envs/global.env (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.77.0 => 2.78.0}/scripts/upgrade.sh (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/.env (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/data.yml (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/data/config-example.yaml (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/docker-compose.yml (90%) rename appstore/nezha/{1.14.7 => 1.14.8}/envs/default.env (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/envs/global.env (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/scripts/init.sh (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/scripts/uninstall.sh (100%) rename appstore/nezha/{1.14.7 => 1.14.8}/scripts/upgrade.sh (100%) diff --git a/appstore/casdoor/2.77.0/.env b/appstore/casdoor/2.78.0/.env similarity index 100% rename from appstore/casdoor/2.77.0/.env rename to appstore/casdoor/2.78.0/.env diff --git a/appstore/casdoor/2.77.0/config/init_data.json b/appstore/casdoor/2.78.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.77.0/config/init_data.json rename to appstore/casdoor/2.78.0/config/init_data.json diff --git a/appstore/casdoor/2.77.0/data.yml b/appstore/casdoor/2.78.0/data.yml similarity index 100% rename from appstore/casdoor/2.77.0/data.yml rename to appstore/casdoor/2.78.0/data.yml diff --git a/appstore/casdoor/2.77.0/docker-compose.yml b/appstore/casdoor/2.78.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.77.0/docker-compose.yml rename to appstore/casdoor/2.78.0/docker-compose.yml index eb08c2458..842095b10 100644 --- a/appstore/casdoor/2.77.0/docker-compose.yml +++ b/appstore/casdoor/2.78.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.77.0 + image: casbin/casdoor:v2.78.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.77.0/envs/casdoor.env b/appstore/casdoor/2.78.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.77.0/envs/casdoor.env rename to appstore/casdoor/2.78.0/envs/casdoor.env diff --git a/appstore/casdoor/2.77.0/envs/default.env b/appstore/casdoor/2.78.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.77.0/envs/default.env rename to appstore/casdoor/2.78.0/envs/default.env diff --git a/appstore/casdoor/2.77.0/envs/global.env b/appstore/casdoor/2.78.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.77.0/envs/global.env rename to appstore/casdoor/2.78.0/envs/global.env diff --git a/appstore/casdoor/2.77.0/scripts/init.sh b/appstore/casdoor/2.78.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.77.0/scripts/init.sh rename to appstore/casdoor/2.78.0/scripts/init.sh diff --git a/appstore/casdoor/2.77.0/scripts/uninstall.sh b/appstore/casdoor/2.78.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.77.0/scripts/uninstall.sh rename to appstore/casdoor/2.78.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.77.0/scripts/upgrade.sh b/appstore/casdoor/2.78.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.77.0/scripts/upgrade.sh rename to appstore/casdoor/2.78.0/scripts/upgrade.sh diff --git a/appstore/nezha/1.14.7/.env b/appstore/nezha/1.14.8/.env similarity index 100% rename from appstore/nezha/1.14.7/.env rename to appstore/nezha/1.14.8/.env diff --git a/appstore/nezha/1.14.7/data.yml b/appstore/nezha/1.14.8/data.yml similarity index 100% rename from appstore/nezha/1.14.7/data.yml rename to appstore/nezha/1.14.8/data.yml diff --git a/appstore/nezha/1.14.7/data/config-example.yaml b/appstore/nezha/1.14.8/data/config-example.yaml similarity index 100% rename from appstore/nezha/1.14.7/data/config-example.yaml rename to appstore/nezha/1.14.8/data/config-example.yaml diff --git a/appstore/nezha/1.14.7/docker-compose.yml b/appstore/nezha/1.14.8/docker-compose.yml similarity index 90% rename from appstore/nezha/1.14.7/docker-compose.yml rename to appstore/nezha/1.14.8/docker-compose.yml index a9b6d0420..563c3056a 100644 --- a/appstore/nezha/1.14.7/docker-compose.yml +++ b/appstore/nezha/1.14.8/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.7 + image: ghcr.io/nezhahq/nezha:v1.14.8 labels: createdBy: Apps networks: diff --git a/appstore/nezha/1.14.7/envs/default.env b/appstore/nezha/1.14.8/envs/default.env similarity index 100% rename from appstore/nezha/1.14.7/envs/default.env rename to appstore/nezha/1.14.8/envs/default.env diff --git a/appstore/nezha/1.14.7/envs/global.env b/appstore/nezha/1.14.8/envs/global.env similarity index 100% rename from appstore/nezha/1.14.7/envs/global.env rename to appstore/nezha/1.14.8/envs/global.env diff --git a/appstore/nezha/1.14.7/scripts/init.sh b/appstore/nezha/1.14.8/scripts/init.sh similarity index 100% rename from appstore/nezha/1.14.7/scripts/init.sh rename to appstore/nezha/1.14.8/scripts/init.sh diff --git a/appstore/nezha/1.14.7/scripts/uninstall.sh b/appstore/nezha/1.14.8/scripts/uninstall.sh similarity index 100% rename from appstore/nezha/1.14.7/scripts/uninstall.sh rename to appstore/nezha/1.14.8/scripts/uninstall.sh diff --git a/appstore/nezha/1.14.7/scripts/upgrade.sh b/appstore/nezha/1.14.8/scripts/upgrade.sh similarity index 100% rename from appstore/nezha/1.14.7/scripts/upgrade.sh rename to appstore/nezha/1.14.8/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index eb08c2458..842095b10 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.77.0 + image: casbin/casdoor:v2.78.0 labels: createdBy: Apps networks: diff --git a/dockge/nezha/docker-compose.yml b/dockge/nezha/docker-compose.yml index a9b6d0420..563c3056a 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/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.7 + image: ghcr.io/nezhahq/nezha:v1.14.8 labels: createdBy: Apps networks: From 09b6cc88799720f509eb1839b0b8211073d36847 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 18:34:00 +0000 Subject: [PATCH 026/262] Update cloudnas/clouddrive2 Docker tag to v0.9.9 --- apps/clouddrive2/0.9.8/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/clouddrive2/0.9.8/docker-compose.yml b/apps/clouddrive2/0.9.8/docker-compose.yml index 25a65b079..3ec90b003 100644 --- a/apps/clouddrive2/0.9.8/docker-compose.yml +++ b/apps/clouddrive2/0.9.8/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: clouddrive2: - image: cloudnas/clouddrive2:0.9.8 + image: cloudnas/clouddrive2:0.9.9 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From a3ce81fd920466ac99498dbf255b3dd624e67be4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 18:34:04 +0000 Subject: [PATCH 027/262] Update weblate/weblate Docker tag to v5.13.3.5 --- apps/weblate/5.13.3.4/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/weblate/5.13.3.4/docker-compose.yml b/apps/weblate/5.13.3.4/docker-compose.yml index f06e923a0..ab4528bcf 100644 --- a/apps/weblate/5.13.3.4/docker-compose.yml +++ b/apps/weblate/5.13.3.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: weblate: - image: weblate/weblate:5.13.3.4 + image: weblate/weblate:5.13.3.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 5a8bb2215f7c5b3c45e13989f02bf7d7ca422b13 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 18:34:10 +0000 Subject: [PATCH 028/262] Update app version [skip ci] --- apps/clouddrive2/{0.9.8 => 0.9.9}/data.yml | 0 apps/clouddrive2/{0.9.8 => 0.9.9}/docker-compose.yml | 0 apps/clouddrive2/{0.9.8 => 0.9.9}/envs/default.env | 0 apps/clouddrive2/{0.9.8 => 0.9.9}/envs/global.env | 0 apps/clouddrive2/{0.9.8 => 0.9.9}/scripts/init.sh | 0 apps/clouddrive2/{0.9.8 => 0.9.9}/scripts/uninstall.sh | 0 apps/clouddrive2/{0.9.8 => 0.9.9}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/clouddrive2/{0.9.8 => 0.9.9}/data.yml (100%) rename apps/clouddrive2/{0.9.8 => 0.9.9}/docker-compose.yml (100%) rename apps/clouddrive2/{0.9.8 => 0.9.9}/envs/default.env (100%) rename apps/clouddrive2/{0.9.8 => 0.9.9}/envs/global.env (100%) rename apps/clouddrive2/{0.9.8 => 0.9.9}/scripts/init.sh (100%) rename apps/clouddrive2/{0.9.8 => 0.9.9}/scripts/uninstall.sh (100%) rename apps/clouddrive2/{0.9.8 => 0.9.9}/scripts/upgrade.sh (100%) diff --git a/apps/clouddrive2/0.9.8/data.yml b/apps/clouddrive2/0.9.9/data.yml similarity index 100% rename from apps/clouddrive2/0.9.8/data.yml rename to apps/clouddrive2/0.9.9/data.yml diff --git a/apps/clouddrive2/0.9.8/docker-compose.yml b/apps/clouddrive2/0.9.9/docker-compose.yml similarity index 100% rename from apps/clouddrive2/0.9.8/docker-compose.yml rename to apps/clouddrive2/0.9.9/docker-compose.yml diff --git a/apps/clouddrive2/0.9.8/envs/default.env b/apps/clouddrive2/0.9.9/envs/default.env similarity index 100% rename from apps/clouddrive2/0.9.8/envs/default.env rename to apps/clouddrive2/0.9.9/envs/default.env diff --git a/apps/clouddrive2/0.9.8/envs/global.env b/apps/clouddrive2/0.9.9/envs/global.env similarity index 100% rename from apps/clouddrive2/0.9.8/envs/global.env rename to apps/clouddrive2/0.9.9/envs/global.env diff --git a/apps/clouddrive2/0.9.8/scripts/init.sh b/apps/clouddrive2/0.9.9/scripts/init.sh similarity index 100% rename from apps/clouddrive2/0.9.8/scripts/init.sh rename to apps/clouddrive2/0.9.9/scripts/init.sh diff --git a/apps/clouddrive2/0.9.8/scripts/uninstall.sh b/apps/clouddrive2/0.9.9/scripts/uninstall.sh similarity index 100% rename from apps/clouddrive2/0.9.8/scripts/uninstall.sh rename to apps/clouddrive2/0.9.9/scripts/uninstall.sh diff --git a/apps/clouddrive2/0.9.8/scripts/upgrade.sh b/apps/clouddrive2/0.9.9/scripts/upgrade.sh similarity index 100% rename from apps/clouddrive2/0.9.8/scripts/upgrade.sh rename to apps/clouddrive2/0.9.9/scripts/upgrade.sh From 093567cf1b58f8f507674b5bd98be2baaad36e57 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 18:34:15 +0000 Subject: [PATCH 029/262] Update app version [skip ci] --- apps/weblate/{5.13.3.4 => 5.13.3.5}/data.yml | 0 apps/weblate/{5.13.3.4 => 5.13.3.5}/docker-compose.yml | 0 apps/weblate/{5.13.3.4 => 5.13.3.5}/envs/default.env | 0 apps/weblate/{5.13.3.4 => 5.13.3.5}/envs/global.env | 0 apps/weblate/{5.13.3.4 => 5.13.3.5}/scripts/init.sh | 0 apps/weblate/{5.13.3.4 => 5.13.3.5}/scripts/uninstall.sh | 0 apps/weblate/{5.13.3.4 => 5.13.3.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/data.yml (100%) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/docker-compose.yml (100%) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/envs/default.env (100%) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/envs/global.env (100%) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/scripts/init.sh (100%) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/scripts/uninstall.sh (100%) rename apps/weblate/{5.13.3.4 => 5.13.3.5}/scripts/upgrade.sh (100%) diff --git a/apps/weblate/5.13.3.4/data.yml b/apps/weblate/5.13.3.5/data.yml similarity index 100% rename from apps/weblate/5.13.3.4/data.yml rename to apps/weblate/5.13.3.5/data.yml diff --git a/apps/weblate/5.13.3.4/docker-compose.yml b/apps/weblate/5.13.3.5/docker-compose.yml similarity index 100% rename from apps/weblate/5.13.3.4/docker-compose.yml rename to apps/weblate/5.13.3.5/docker-compose.yml diff --git a/apps/weblate/5.13.3.4/envs/default.env b/apps/weblate/5.13.3.5/envs/default.env similarity index 100% rename from apps/weblate/5.13.3.4/envs/default.env rename to apps/weblate/5.13.3.5/envs/default.env diff --git a/apps/weblate/5.13.3.4/envs/global.env b/apps/weblate/5.13.3.5/envs/global.env similarity index 100% rename from apps/weblate/5.13.3.4/envs/global.env rename to apps/weblate/5.13.3.5/envs/global.env diff --git a/apps/weblate/5.13.3.4/scripts/init.sh b/apps/weblate/5.13.3.5/scripts/init.sh similarity index 100% rename from apps/weblate/5.13.3.4/scripts/init.sh rename to apps/weblate/5.13.3.5/scripts/init.sh diff --git a/apps/weblate/5.13.3.4/scripts/uninstall.sh b/apps/weblate/5.13.3.5/scripts/uninstall.sh similarity index 100% rename from apps/weblate/5.13.3.4/scripts/uninstall.sh rename to apps/weblate/5.13.3.5/scripts/uninstall.sh diff --git a/apps/weblate/5.13.3.4/scripts/upgrade.sh b/apps/weblate/5.13.3.5/scripts/upgrade.sh similarity index 100% rename from apps/weblate/5.13.3.4/scripts/upgrade.sh rename to apps/weblate/5.13.3.5/scripts/upgrade.sh From 20785e436ef28bffc557367a9d0e38818e0775d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 19:14:04 +0000 Subject: [PATCH 030/262] Update henrygd/beszel Docker tag to v0.13.2 --- apps/beszel/0.13.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/beszel/0.13.1/docker-compose.yml b/apps/beszel/0.13.1/docker-compose.yml index bb20f0166..7b7260be9 100644 --- a/apps/beszel/0.13.1/docker-compose.yml +++ b/apps/beszel/0.13.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: beszel: - image: henrygd/beszel:0.13.1 + image: henrygd/beszel:0.13.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From fb132f6ba5e7c2206f5d1894faa5c8dc21c9ecfb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 19:14:08 +0000 Subject: [PATCH 031/262] Update henrygd/beszel-agent Docker tag to v0.13.2 --- apps/beszel-agent/0.13.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/beszel-agent/0.13.1/docker-compose.yml b/apps/beszel-agent/0.13.1/docker-compose.yml index a474c104f..d7cf3595c 100644 --- a/apps/beszel-agent/0.13.1/docker-compose.yml +++ b/apps/beszel-agent/0.13.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: beszel-agent: - image: henrygd/beszel-agent:0.13.1 + image: henrygd/beszel-agent:0.13.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From d380a59599b241dedeb5107bfcee1c0c876d51a2 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 19:14:18 +0000 Subject: [PATCH 032/262] Update app version [skip ci] --- apps/beszel-agent/{0.13.1 => 0.13.2}/data.yml | 0 apps/beszel-agent/{0.13.1 => 0.13.2}/docker-compose.yml | 0 apps/beszel-agent/{0.13.1 => 0.13.2}/envs/default.env | 0 apps/beszel-agent/{0.13.1 => 0.13.2}/envs/global.env | 0 apps/beszel-agent/{0.13.1 => 0.13.2}/scripts/init.sh | 0 apps/beszel-agent/{0.13.1 => 0.13.2}/scripts/uninstall.sh | 0 apps/beszel-agent/{0.13.1 => 0.13.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/beszel-agent/{0.13.1 => 0.13.2}/data.yml (100%) rename apps/beszel-agent/{0.13.1 => 0.13.2}/docker-compose.yml (100%) rename apps/beszel-agent/{0.13.1 => 0.13.2}/envs/default.env (100%) rename apps/beszel-agent/{0.13.1 => 0.13.2}/envs/global.env (100%) rename apps/beszel-agent/{0.13.1 => 0.13.2}/scripts/init.sh (100%) rename apps/beszel-agent/{0.13.1 => 0.13.2}/scripts/uninstall.sh (100%) rename apps/beszel-agent/{0.13.1 => 0.13.2}/scripts/upgrade.sh (100%) diff --git a/apps/beszel-agent/0.13.1/data.yml b/apps/beszel-agent/0.13.2/data.yml similarity index 100% rename from apps/beszel-agent/0.13.1/data.yml rename to apps/beszel-agent/0.13.2/data.yml diff --git a/apps/beszel-agent/0.13.1/docker-compose.yml b/apps/beszel-agent/0.13.2/docker-compose.yml similarity index 100% rename from apps/beszel-agent/0.13.1/docker-compose.yml rename to apps/beszel-agent/0.13.2/docker-compose.yml diff --git a/apps/beszel-agent/0.13.1/envs/default.env b/apps/beszel-agent/0.13.2/envs/default.env similarity index 100% rename from apps/beszel-agent/0.13.1/envs/default.env rename to apps/beszel-agent/0.13.2/envs/default.env diff --git a/apps/beszel-agent/0.13.1/envs/global.env b/apps/beszel-agent/0.13.2/envs/global.env similarity index 100% rename from apps/beszel-agent/0.13.1/envs/global.env rename to apps/beszel-agent/0.13.2/envs/global.env diff --git a/apps/beszel-agent/0.13.1/scripts/init.sh b/apps/beszel-agent/0.13.2/scripts/init.sh similarity index 100% rename from apps/beszel-agent/0.13.1/scripts/init.sh rename to apps/beszel-agent/0.13.2/scripts/init.sh diff --git a/apps/beszel-agent/0.13.1/scripts/uninstall.sh b/apps/beszel-agent/0.13.2/scripts/uninstall.sh similarity index 100% rename from apps/beszel-agent/0.13.1/scripts/uninstall.sh rename to apps/beszel-agent/0.13.2/scripts/uninstall.sh diff --git a/apps/beszel-agent/0.13.1/scripts/upgrade.sh b/apps/beszel-agent/0.13.2/scripts/upgrade.sh similarity index 100% rename from apps/beszel-agent/0.13.1/scripts/upgrade.sh rename to apps/beszel-agent/0.13.2/scripts/upgrade.sh From 353c7eeae5ef413b56d086c7477e13f8f3103460 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 19:14:27 +0000 Subject: [PATCH 033/262] Update app version [skip ci] --- apps/beszel/{0.13.1 => 0.13.2}/data.yml | 0 apps/beszel/{0.13.1 => 0.13.2}/docker-compose.yml | 0 apps/beszel/{0.13.1 => 0.13.2}/envs/default.env | 0 apps/beszel/{0.13.1 => 0.13.2}/envs/global.env | 0 apps/beszel/{0.13.1 => 0.13.2}/scripts/init.sh | 0 apps/beszel/{0.13.1 => 0.13.2}/scripts/uninstall.sh | 0 apps/beszel/{0.13.1 => 0.13.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/beszel/{0.13.1 => 0.13.2}/data.yml (100%) rename apps/beszel/{0.13.1 => 0.13.2}/docker-compose.yml (100%) rename apps/beszel/{0.13.1 => 0.13.2}/envs/default.env (100%) rename apps/beszel/{0.13.1 => 0.13.2}/envs/global.env (100%) rename apps/beszel/{0.13.1 => 0.13.2}/scripts/init.sh (100%) rename apps/beszel/{0.13.1 => 0.13.2}/scripts/uninstall.sh (100%) rename apps/beszel/{0.13.1 => 0.13.2}/scripts/upgrade.sh (100%) diff --git a/apps/beszel/0.13.1/data.yml b/apps/beszel/0.13.2/data.yml similarity index 100% rename from apps/beszel/0.13.1/data.yml rename to apps/beszel/0.13.2/data.yml diff --git a/apps/beszel/0.13.1/docker-compose.yml b/apps/beszel/0.13.2/docker-compose.yml similarity index 100% rename from apps/beszel/0.13.1/docker-compose.yml rename to apps/beszel/0.13.2/docker-compose.yml diff --git a/apps/beszel/0.13.1/envs/default.env b/apps/beszel/0.13.2/envs/default.env similarity index 100% rename from apps/beszel/0.13.1/envs/default.env rename to apps/beszel/0.13.2/envs/default.env diff --git a/apps/beszel/0.13.1/envs/global.env b/apps/beszel/0.13.2/envs/global.env similarity index 100% rename from apps/beszel/0.13.1/envs/global.env rename to apps/beszel/0.13.2/envs/global.env diff --git a/apps/beszel/0.13.1/scripts/init.sh b/apps/beszel/0.13.2/scripts/init.sh similarity index 100% rename from apps/beszel/0.13.1/scripts/init.sh rename to apps/beszel/0.13.2/scripts/init.sh diff --git a/apps/beszel/0.13.1/scripts/uninstall.sh b/apps/beszel/0.13.2/scripts/uninstall.sh similarity index 100% rename from apps/beszel/0.13.1/scripts/uninstall.sh rename to apps/beszel/0.13.2/scripts/uninstall.sh diff --git a/apps/beszel/0.13.1/scripts/upgrade.sh b/apps/beszel/0.13.2/scripts/upgrade.sh similarity index 100% rename from apps/beszel/0.13.1/scripts/upgrade.sh rename to apps/beszel/0.13.2/scripts/upgrade.sh From fb2a8ff076f5fc80df4836c3913d13569216ba72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 20:20:38 +0000 Subject: [PATCH 034/262] Update emby/embyserver Docker tag to v4.9.2.2 --- apps/emby/4.9.2.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emby/4.9.2.1/docker-compose.yml b/apps/emby/4.9.2.1/docker-compose.yml index 4b9a7947b..5f9b101b7 100644 --- a/apps/emby/4.9.2.1/docker-compose.yml +++ b/apps/emby/4.9.2.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby: - image: emby/embyserver:4.9.2.1 + image: emby/embyserver:4.9.2.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 17a081aa35c63b502aa77e9070349d4b66454e4f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 20:20:42 +0000 Subject: [PATCH 035/262] Update ghost Docker tag to v6.3.0 --- apps/ghost/6.2.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ghost/6.2.0/docker-compose.yml b/apps/ghost/6.2.0/docker-compose.yml index 72d0ace08..876caff28 100644 --- a/apps/ghost/6.2.0/docker-compose.yml +++ b/apps/ghost/6.2.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ghost: - image: ghost:6.2.0 + image: ghost:6.3.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 16723dde129ab89ac1375245932bcacc76cebd84 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 20:20:48 +0000 Subject: [PATCH 036/262] Update app version [skip ci] --- apps/emby/{4.9.2.1 => 4.9.2.2}/data.yml | 0 apps/emby/{4.9.2.1 => 4.9.2.2}/docker-compose.yml | 0 apps/emby/{4.9.2.1 => 4.9.2.2}/envs/default.env | 0 apps/emby/{4.9.2.1 => 4.9.2.2}/envs/global.env | 0 apps/emby/{4.9.2.1 => 4.9.2.2}/scripts/init.sh | 0 apps/emby/{4.9.2.1 => 4.9.2.2}/scripts/uninstall.sh | 0 apps/emby/{4.9.2.1 => 4.9.2.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/emby/{4.9.2.1 => 4.9.2.2}/data.yml (100%) rename apps/emby/{4.9.2.1 => 4.9.2.2}/docker-compose.yml (100%) rename apps/emby/{4.9.2.1 => 4.9.2.2}/envs/default.env (100%) rename apps/emby/{4.9.2.1 => 4.9.2.2}/envs/global.env (100%) rename apps/emby/{4.9.2.1 => 4.9.2.2}/scripts/init.sh (100%) rename apps/emby/{4.9.2.1 => 4.9.2.2}/scripts/uninstall.sh (100%) rename apps/emby/{4.9.2.1 => 4.9.2.2}/scripts/upgrade.sh (100%) diff --git a/apps/emby/4.9.2.1/data.yml b/apps/emby/4.9.2.2/data.yml similarity index 100% rename from apps/emby/4.9.2.1/data.yml rename to apps/emby/4.9.2.2/data.yml diff --git a/apps/emby/4.9.2.1/docker-compose.yml b/apps/emby/4.9.2.2/docker-compose.yml similarity index 100% rename from apps/emby/4.9.2.1/docker-compose.yml rename to apps/emby/4.9.2.2/docker-compose.yml diff --git a/apps/emby/4.9.2.1/envs/default.env b/apps/emby/4.9.2.2/envs/default.env similarity index 100% rename from apps/emby/4.9.2.1/envs/default.env rename to apps/emby/4.9.2.2/envs/default.env diff --git a/apps/emby/4.9.2.1/envs/global.env b/apps/emby/4.9.2.2/envs/global.env similarity index 100% rename from apps/emby/4.9.2.1/envs/global.env rename to apps/emby/4.9.2.2/envs/global.env diff --git a/apps/emby/4.9.2.1/scripts/init.sh b/apps/emby/4.9.2.2/scripts/init.sh similarity index 100% rename from apps/emby/4.9.2.1/scripts/init.sh rename to apps/emby/4.9.2.2/scripts/init.sh diff --git a/apps/emby/4.9.2.1/scripts/uninstall.sh b/apps/emby/4.9.2.2/scripts/uninstall.sh similarity index 100% rename from apps/emby/4.9.2.1/scripts/uninstall.sh rename to apps/emby/4.9.2.2/scripts/uninstall.sh diff --git a/apps/emby/4.9.2.1/scripts/upgrade.sh b/apps/emby/4.9.2.2/scripts/upgrade.sh similarity index 100% rename from apps/emby/4.9.2.1/scripts/upgrade.sh rename to apps/emby/4.9.2.2/scripts/upgrade.sh From 7d31d652ac72821a02c45935feb8169f3233f4f1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 20:20:53 +0000 Subject: [PATCH 037/262] Update app version [skip ci] --- apps/ghost/{6.2.0 => 6.3.0}/data.yml | 0 apps/ghost/{6.2.0 => 6.3.0}/docker-compose.yml | 0 apps/ghost/{6.2.0 => 6.3.0}/envs/default.env | 0 apps/ghost/{6.2.0 => 6.3.0}/envs/global.env | 0 apps/ghost/{6.2.0 => 6.3.0}/scripts/init.sh | 0 apps/ghost/{6.2.0 => 6.3.0}/scripts/uninstall.sh | 0 apps/ghost/{6.2.0 => 6.3.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ghost/{6.2.0 => 6.3.0}/data.yml (100%) rename apps/ghost/{6.2.0 => 6.3.0}/docker-compose.yml (100%) rename apps/ghost/{6.2.0 => 6.3.0}/envs/default.env (100%) rename apps/ghost/{6.2.0 => 6.3.0}/envs/global.env (100%) rename apps/ghost/{6.2.0 => 6.3.0}/scripts/init.sh (100%) rename apps/ghost/{6.2.0 => 6.3.0}/scripts/uninstall.sh (100%) rename apps/ghost/{6.2.0 => 6.3.0}/scripts/upgrade.sh (100%) diff --git a/apps/ghost/6.2.0/data.yml b/apps/ghost/6.3.0/data.yml similarity index 100% rename from apps/ghost/6.2.0/data.yml rename to apps/ghost/6.3.0/data.yml diff --git a/apps/ghost/6.2.0/docker-compose.yml b/apps/ghost/6.3.0/docker-compose.yml similarity index 100% rename from apps/ghost/6.2.0/docker-compose.yml rename to apps/ghost/6.3.0/docker-compose.yml diff --git a/apps/ghost/6.2.0/envs/default.env b/apps/ghost/6.3.0/envs/default.env similarity index 100% rename from apps/ghost/6.2.0/envs/default.env rename to apps/ghost/6.3.0/envs/default.env diff --git a/apps/ghost/6.2.0/envs/global.env b/apps/ghost/6.3.0/envs/global.env similarity index 100% rename from apps/ghost/6.2.0/envs/global.env rename to apps/ghost/6.3.0/envs/global.env diff --git a/apps/ghost/6.2.0/scripts/init.sh b/apps/ghost/6.3.0/scripts/init.sh similarity index 100% rename from apps/ghost/6.2.0/scripts/init.sh rename to apps/ghost/6.3.0/scripts/init.sh diff --git a/apps/ghost/6.2.0/scripts/uninstall.sh b/apps/ghost/6.3.0/scripts/uninstall.sh similarity index 100% rename from apps/ghost/6.2.0/scripts/uninstall.sh rename to apps/ghost/6.3.0/scripts/uninstall.sh diff --git a/apps/ghost/6.2.0/scripts/upgrade.sh b/apps/ghost/6.3.0/scripts/upgrade.sh similarity index 100% rename from apps/ghost/6.2.0/scripts/upgrade.sh rename to apps/ghost/6.3.0/scripts/upgrade.sh From 686a7bad75e0aa56d7797d4cdb5911e4d4b5ece2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 21:13:45 +0000 Subject: [PATCH 038/262] Update flaresolverr/flaresolverr Docker tag to v3.4.2 --- apps/flaresolverr/3.4.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/flaresolverr/3.4.1/docker-compose.yml b/apps/flaresolverr/3.4.1/docker-compose.yml index 684ebc041..8311b0635 100644 --- a/apps/flaresolverr/3.4.1/docker-compose.yml +++ b/apps/flaresolverr/3.4.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: flaresolverr: - image: flaresolverr/flaresolverr:v3.4.1 + image: flaresolverr/flaresolverr:v3.4.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From fe0a5930974af8f9befd08c11a87faa4baaf0e91 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 9 Oct 2025 21:13:55 +0000 Subject: [PATCH 039/262] Update app version [skip ci] --- apps/flaresolverr/{3.4.1 => 3.4.2}/data.yml | 0 apps/flaresolverr/{3.4.1 => 3.4.2}/docker-compose.yml | 0 apps/flaresolverr/{3.4.1 => 3.4.2}/envs/default.env | 0 apps/flaresolverr/{3.4.1 => 3.4.2}/envs/global.env | 0 apps/flaresolverr/{3.4.1 => 3.4.2}/scripts/init.sh | 0 apps/flaresolverr/{3.4.1 => 3.4.2}/scripts/uninstall.sh | 0 apps/flaresolverr/{3.4.1 => 3.4.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/flaresolverr/{3.4.1 => 3.4.2}/data.yml (100%) rename apps/flaresolverr/{3.4.1 => 3.4.2}/docker-compose.yml (100%) rename apps/flaresolverr/{3.4.1 => 3.4.2}/envs/default.env (100%) rename apps/flaresolverr/{3.4.1 => 3.4.2}/envs/global.env (100%) rename apps/flaresolverr/{3.4.1 => 3.4.2}/scripts/init.sh (100%) rename apps/flaresolverr/{3.4.1 => 3.4.2}/scripts/uninstall.sh (100%) rename apps/flaresolverr/{3.4.1 => 3.4.2}/scripts/upgrade.sh (100%) diff --git a/apps/flaresolverr/3.4.1/data.yml b/apps/flaresolverr/3.4.2/data.yml similarity index 100% rename from apps/flaresolverr/3.4.1/data.yml rename to apps/flaresolverr/3.4.2/data.yml diff --git a/apps/flaresolverr/3.4.1/docker-compose.yml b/apps/flaresolverr/3.4.2/docker-compose.yml similarity index 100% rename from apps/flaresolverr/3.4.1/docker-compose.yml rename to apps/flaresolverr/3.4.2/docker-compose.yml diff --git a/apps/flaresolverr/3.4.1/envs/default.env b/apps/flaresolverr/3.4.2/envs/default.env similarity index 100% rename from apps/flaresolverr/3.4.1/envs/default.env rename to apps/flaresolverr/3.4.2/envs/default.env diff --git a/apps/flaresolverr/3.4.1/envs/global.env b/apps/flaresolverr/3.4.2/envs/global.env similarity index 100% rename from apps/flaresolverr/3.4.1/envs/global.env rename to apps/flaresolverr/3.4.2/envs/global.env diff --git a/apps/flaresolverr/3.4.1/scripts/init.sh b/apps/flaresolverr/3.4.2/scripts/init.sh similarity index 100% rename from apps/flaresolverr/3.4.1/scripts/init.sh rename to apps/flaresolverr/3.4.2/scripts/init.sh diff --git a/apps/flaresolverr/3.4.1/scripts/uninstall.sh b/apps/flaresolverr/3.4.2/scripts/uninstall.sh similarity index 100% rename from apps/flaresolverr/3.4.1/scripts/uninstall.sh rename to apps/flaresolverr/3.4.2/scripts/uninstall.sh diff --git a/apps/flaresolverr/3.4.1/scripts/upgrade.sh b/apps/flaresolverr/3.4.2/scripts/upgrade.sh similarity index 100% rename from apps/flaresolverr/3.4.1/scripts/upgrade.sh rename to apps/flaresolverr/3.4.2/scripts/upgrade.sh From 7c37d2a5fbc20820b455b365cec52648b00d7bab Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 9 Oct 2025 21:18:29 +0000 Subject: [PATCH 040/262] Processed apps directory via GitHub Actions --- appstore/beszel-agent/{0.13.1 => 0.13.2}/.env | 0 appstore/beszel-agent/{0.13.1 => 0.13.2}/data.yml | 0 appstore/beszel-agent/{0.13.1 => 0.13.2}/docker-compose.yml | 2 +- appstore/beszel-agent/{0.13.1 => 0.13.2}/envs/default.env | 0 appstore/beszel-agent/{0.13.1 => 0.13.2}/envs/global.env | 0 appstore/beszel-agent/{0.13.1 => 0.13.2}/scripts/init.sh | 0 appstore/beszel-agent/{0.13.1 => 0.13.2}/scripts/uninstall.sh | 0 appstore/beszel-agent/{0.13.1 => 0.13.2}/scripts/upgrade.sh | 0 appstore/beszel/{0.13.1 => 0.13.2}/.env | 0 appstore/beszel/{0.13.1 => 0.13.2}/data.yml | 0 appstore/beszel/{0.13.1 => 0.13.2}/docker-compose.yml | 2 +- appstore/beszel/{0.13.1 => 0.13.2}/envs/default.env | 0 appstore/beszel/{0.13.1 => 0.13.2}/envs/global.env | 0 appstore/beszel/{0.13.1 => 0.13.2}/scripts/init.sh | 0 appstore/beszel/{0.13.1 => 0.13.2}/scripts/uninstall.sh | 0 appstore/beszel/{0.13.1 => 0.13.2}/scripts/upgrade.sh | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/.env | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/data.yml | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/docker-compose.yml | 2 +- appstore/clouddrive2/{0.9.8 => 0.9.9}/envs/default.env | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/envs/global.env | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/scripts/init.sh | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/scripts/uninstall.sh | 0 appstore/clouddrive2/{0.9.8 => 0.9.9}/scripts/upgrade.sh | 0 appstore/emby/{4.9.2.1 => 4.9.2.2}/.env | 0 appstore/emby/{4.9.2.1 => 4.9.2.2}/data.yml | 0 .../emby_4_9_2_1 => appstore/emby/4.9.2.2}/docker-compose.yml | 2 +- appstore/emby/{4.9.2.1 => 4.9.2.2}/envs/default.env | 0 appstore/emby/{4.9.2.1 => 4.9.2.2}/envs/global.env | 0 appstore/emby/{4.9.2.1 => 4.9.2.2}/scripts/init.sh | 0 appstore/emby/{4.9.2.1 => 4.9.2.2}/scripts/uninstall.sh | 0 appstore/emby/{4.9.2.1 => 4.9.2.2}/scripts/upgrade.sh | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/.env | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/data.yml | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/docker-compose.yml | 2 +- appstore/flaresolverr/{3.4.1 => 3.4.2}/envs/default.env | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/envs/global.env | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/scripts/init.sh | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/scripts/uninstall.sh | 0 appstore/flaresolverr/{3.4.1 => 3.4.2}/scripts/upgrade.sh | 0 appstore/ghost/{6.2.0 => 6.3.0}/.env | 0 appstore/ghost/{6.2.0 => 6.3.0}/data.yml | 0 appstore/ghost/{6.2.0 => 6.3.0}/docker-compose.yml | 2 +- appstore/ghost/{6.2.0 => 6.3.0}/envs/default.env | 0 appstore/ghost/{6.2.0 => 6.3.0}/envs/global.env | 0 appstore/ghost/{6.2.0 => 6.3.0}/scripts/init.sh | 0 appstore/ghost/{6.2.0 => 6.3.0}/scripts/uninstall.sh | 0 appstore/ghost/{6.2.0 => 6.3.0}/scripts/upgrade.sh | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/.env | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/data.yml | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/docker-compose.yml | 2 +- appstore/weblate/{5.13.3.4 => 5.13.3.5}/envs/default.env | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/envs/global.env | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/scripts/init.sh | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/scripts/uninstall.sh | 0 appstore/weblate/{5.13.3.4 => 5.13.3.5}/scripts/upgrade.sh | 0 dockge/beszel-agent/docker-compose.yml | 2 +- dockge/beszel/docker-compose.yml | 2 +- dockge/clouddrive2/docker-compose.yml | 2 +- dockge/{emby_4_9_2_1 => emby_4_9_2_2}/.env | 0 .../emby/4.9.2.1 => dockge/emby_4_9_2_2}/docker-compose.yml | 2 +- dockge/{emby_4_9_2_1 => emby_4_9_2_2}/envs/default.env | 0 dockge/{emby_4_9_2_1 => emby_4_9_2_2}/envs/global.env | 0 dockge/flaresolverr/docker-compose.yml | 2 +- dockge/ghost/docker-compose.yml | 2 +- dockge/weblate/docker-compose.yml | 2 +- 66 files changed, 14 insertions(+), 14 deletions(-) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/.env (100%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/data.yml (100%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/docker-compose.yml (92%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/envs/default.env (100%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/envs/global.env (100%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/scripts/init.sh (100%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/scripts/uninstall.sh (100%) rename appstore/beszel-agent/{0.13.1 => 0.13.2}/scripts/upgrade.sh (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/.env (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/data.yml (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/docker-compose.yml (91%) rename appstore/beszel/{0.13.1 => 0.13.2}/envs/default.env (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/envs/global.env (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/scripts/init.sh (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/scripts/uninstall.sh (100%) rename appstore/beszel/{0.13.1 => 0.13.2}/scripts/upgrade.sh (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/.env (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/data.yml (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/docker-compose.yml (94%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/envs/default.env (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/envs/global.env (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/scripts/init.sh (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/scripts/uninstall.sh (100%) rename appstore/clouddrive2/{0.9.8 => 0.9.9}/scripts/upgrade.sh (100%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/.env (100%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/data.yml (100%) rename {dockge/emby_4_9_2_1 => appstore/emby/4.9.2.2}/docker-compose.yml (96%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/envs/default.env (100%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/envs/global.env (100%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/scripts/init.sh (100%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/scripts/uninstall.sh (100%) rename appstore/emby/{4.9.2.1 => 4.9.2.2}/scripts/upgrade.sh (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/.env (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/data.yml (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/docker-compose.yml (93%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/envs/default.env (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/envs/global.env (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/scripts/init.sh (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/scripts/uninstall.sh (100%) rename appstore/flaresolverr/{3.4.1 => 3.4.2}/scripts/upgrade.sh (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/.env (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/data.yml (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/docker-compose.yml (95%) rename appstore/ghost/{6.2.0 => 6.3.0}/envs/default.env (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/envs/global.env (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/scripts/init.sh (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/scripts/uninstall.sh (100%) rename appstore/ghost/{6.2.0 => 6.3.0}/scripts/upgrade.sh (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/.env (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/data.yml (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/docker-compose.yml (94%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/envs/default.env (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/envs/global.env (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/scripts/init.sh (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/scripts/uninstall.sh (100%) rename appstore/weblate/{5.13.3.4 => 5.13.3.5}/scripts/upgrade.sh (100%) rename dockge/{emby_4_9_2_1 => emby_4_9_2_2}/.env (100%) rename {appstore/emby/4.9.2.1 => dockge/emby_4_9_2_2}/docker-compose.yml (96%) rename dockge/{emby_4_9_2_1 => emby_4_9_2_2}/envs/default.env (100%) rename dockge/{emby_4_9_2_1 => emby_4_9_2_2}/envs/global.env (100%) diff --git a/appstore/beszel-agent/0.13.1/.env b/appstore/beszel-agent/0.13.2/.env similarity index 100% rename from appstore/beszel-agent/0.13.1/.env rename to appstore/beszel-agent/0.13.2/.env diff --git a/appstore/beszel-agent/0.13.1/data.yml b/appstore/beszel-agent/0.13.2/data.yml similarity index 100% rename from appstore/beszel-agent/0.13.1/data.yml rename to appstore/beszel-agent/0.13.2/data.yml diff --git a/appstore/beszel-agent/0.13.1/docker-compose.yml b/appstore/beszel-agent/0.13.2/docker-compose.yml similarity index 92% rename from appstore/beszel-agent/0.13.1/docker-compose.yml rename to appstore/beszel-agent/0.13.2/docker-compose.yml index 7b7cf4e4a..50f2d3fde 100644 --- a/appstore/beszel-agent/0.13.1/docker-compose.yml +++ b/appstore/beszel-agent/0.13.2/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - LOG_LEVEL=info - PORT=${PANEL_APP_PORT_HTTP:-45876} - image: henrygd/beszel-agent:0.13.1 + image: henrygd/beszel-agent:0.13.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/appstore/beszel-agent/0.13.1/envs/default.env b/appstore/beszel-agent/0.13.2/envs/default.env similarity index 100% rename from appstore/beszel-agent/0.13.1/envs/default.env rename to appstore/beszel-agent/0.13.2/envs/default.env diff --git a/appstore/beszel-agent/0.13.1/envs/global.env b/appstore/beszel-agent/0.13.2/envs/global.env similarity index 100% rename from appstore/beszel-agent/0.13.1/envs/global.env rename to appstore/beszel-agent/0.13.2/envs/global.env diff --git a/appstore/beszel-agent/0.13.1/scripts/init.sh b/appstore/beszel-agent/0.13.2/scripts/init.sh similarity index 100% rename from appstore/beszel-agent/0.13.1/scripts/init.sh rename to appstore/beszel-agent/0.13.2/scripts/init.sh diff --git a/appstore/beszel-agent/0.13.1/scripts/uninstall.sh b/appstore/beszel-agent/0.13.2/scripts/uninstall.sh similarity index 100% rename from appstore/beszel-agent/0.13.1/scripts/uninstall.sh rename to appstore/beszel-agent/0.13.2/scripts/uninstall.sh diff --git a/appstore/beszel-agent/0.13.1/scripts/upgrade.sh b/appstore/beszel-agent/0.13.2/scripts/upgrade.sh similarity index 100% rename from appstore/beszel-agent/0.13.1/scripts/upgrade.sh rename to appstore/beszel-agent/0.13.2/scripts/upgrade.sh diff --git a/appstore/beszel/0.13.1/.env b/appstore/beszel/0.13.2/.env similarity index 100% rename from appstore/beszel/0.13.1/.env rename to appstore/beszel/0.13.2/.env diff --git a/appstore/beszel/0.13.1/data.yml b/appstore/beszel/0.13.2/data.yml similarity index 100% rename from appstore/beszel/0.13.1/data.yml rename to appstore/beszel/0.13.2/data.yml diff --git a/appstore/beszel/0.13.1/docker-compose.yml b/appstore/beszel/0.13.2/docker-compose.yml similarity index 91% rename from appstore/beszel/0.13.1/docker-compose.yml rename to appstore/beszel/0.13.2/docker-compose.yml index 17847c415..fa9647aed 100644 --- a/appstore/beszel/0.13.1/docker-compose.yml +++ b/appstore/beszel/0.13.2/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: henrygd/beszel:0.13.1 + image: henrygd/beszel:0.13.2 labels: createdBy: Apps networks: diff --git a/appstore/beszel/0.13.1/envs/default.env b/appstore/beszel/0.13.2/envs/default.env similarity index 100% rename from appstore/beszel/0.13.1/envs/default.env rename to appstore/beszel/0.13.2/envs/default.env diff --git a/appstore/beszel/0.13.1/envs/global.env b/appstore/beszel/0.13.2/envs/global.env similarity index 100% rename from appstore/beszel/0.13.1/envs/global.env rename to appstore/beszel/0.13.2/envs/global.env diff --git a/appstore/beszel/0.13.1/scripts/init.sh b/appstore/beszel/0.13.2/scripts/init.sh similarity index 100% rename from appstore/beszel/0.13.1/scripts/init.sh rename to appstore/beszel/0.13.2/scripts/init.sh diff --git a/appstore/beszel/0.13.1/scripts/uninstall.sh b/appstore/beszel/0.13.2/scripts/uninstall.sh similarity index 100% rename from appstore/beszel/0.13.1/scripts/uninstall.sh rename to appstore/beszel/0.13.2/scripts/uninstall.sh diff --git a/appstore/beszel/0.13.1/scripts/upgrade.sh b/appstore/beszel/0.13.2/scripts/upgrade.sh similarity index 100% rename from appstore/beszel/0.13.1/scripts/upgrade.sh rename to appstore/beszel/0.13.2/scripts/upgrade.sh diff --git a/appstore/clouddrive2/0.9.8/.env b/appstore/clouddrive2/0.9.9/.env similarity index 100% rename from appstore/clouddrive2/0.9.8/.env rename to appstore/clouddrive2/0.9.9/.env diff --git a/appstore/clouddrive2/0.9.8/data.yml b/appstore/clouddrive2/0.9.9/data.yml similarity index 100% rename from appstore/clouddrive2/0.9.8/data.yml rename to appstore/clouddrive2/0.9.9/data.yml diff --git a/appstore/clouddrive2/0.9.8/docker-compose.yml b/appstore/clouddrive2/0.9.9/docker-compose.yml similarity index 94% rename from appstore/clouddrive2/0.9.8/docker-compose.yml rename to appstore/clouddrive2/0.9.9/docker-compose.yml index c4331d444..33543f258 100644 --- a/appstore/clouddrive2/0.9.8/docker-compose.yml +++ b/appstore/clouddrive2/0.9.9/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - TZ=Asia/Shanghai - CLOUDDRIVE_HOME=/Config - image: cloudnas/clouddrive2:0.9.8 + image: cloudnas/clouddrive2:0.9.9 labels: createdBy: Apps networks: diff --git a/appstore/clouddrive2/0.9.8/envs/default.env b/appstore/clouddrive2/0.9.9/envs/default.env similarity index 100% rename from appstore/clouddrive2/0.9.8/envs/default.env rename to appstore/clouddrive2/0.9.9/envs/default.env diff --git a/appstore/clouddrive2/0.9.8/envs/global.env b/appstore/clouddrive2/0.9.9/envs/global.env similarity index 100% rename from appstore/clouddrive2/0.9.8/envs/global.env rename to appstore/clouddrive2/0.9.9/envs/global.env diff --git a/appstore/clouddrive2/0.9.8/scripts/init.sh b/appstore/clouddrive2/0.9.9/scripts/init.sh similarity index 100% rename from appstore/clouddrive2/0.9.8/scripts/init.sh rename to appstore/clouddrive2/0.9.9/scripts/init.sh diff --git a/appstore/clouddrive2/0.9.8/scripts/uninstall.sh b/appstore/clouddrive2/0.9.9/scripts/uninstall.sh similarity index 100% rename from appstore/clouddrive2/0.9.8/scripts/uninstall.sh rename to appstore/clouddrive2/0.9.9/scripts/uninstall.sh diff --git a/appstore/clouddrive2/0.9.8/scripts/upgrade.sh b/appstore/clouddrive2/0.9.9/scripts/upgrade.sh similarity index 100% rename from appstore/clouddrive2/0.9.8/scripts/upgrade.sh rename to appstore/clouddrive2/0.9.9/scripts/upgrade.sh diff --git a/appstore/emby/4.9.2.1/.env b/appstore/emby/4.9.2.2/.env similarity index 100% rename from appstore/emby/4.9.2.1/.env rename to appstore/emby/4.9.2.2/.env diff --git a/appstore/emby/4.9.2.1/data.yml b/appstore/emby/4.9.2.2/data.yml similarity index 100% rename from appstore/emby/4.9.2.1/data.yml rename to appstore/emby/4.9.2.2/data.yml diff --git a/dockge/emby_4_9_2_1/docker-compose.yml b/appstore/emby/4.9.2.2/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_2_1/docker-compose.yml rename to appstore/emby/4.9.2.2/docker-compose.yml index 73b330c12..fd43b5f8e 100644 --- a/dockge/emby_4_9_2_1/docker-compose.yml +++ b/appstore/emby/4.9.2.2/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.1 + image: emby/embyserver:4.9.2.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/emby/4.9.2.1/envs/default.env b/appstore/emby/4.9.2.2/envs/default.env similarity index 100% rename from appstore/emby/4.9.2.1/envs/default.env rename to appstore/emby/4.9.2.2/envs/default.env diff --git a/appstore/emby/4.9.2.1/envs/global.env b/appstore/emby/4.9.2.2/envs/global.env similarity index 100% rename from appstore/emby/4.9.2.1/envs/global.env rename to appstore/emby/4.9.2.2/envs/global.env diff --git a/appstore/emby/4.9.2.1/scripts/init.sh b/appstore/emby/4.9.2.2/scripts/init.sh similarity index 100% rename from appstore/emby/4.9.2.1/scripts/init.sh rename to appstore/emby/4.9.2.2/scripts/init.sh diff --git a/appstore/emby/4.9.2.1/scripts/uninstall.sh b/appstore/emby/4.9.2.2/scripts/uninstall.sh similarity index 100% rename from appstore/emby/4.9.2.1/scripts/uninstall.sh rename to appstore/emby/4.9.2.2/scripts/uninstall.sh diff --git a/appstore/emby/4.9.2.1/scripts/upgrade.sh b/appstore/emby/4.9.2.2/scripts/upgrade.sh similarity index 100% rename from appstore/emby/4.9.2.1/scripts/upgrade.sh rename to appstore/emby/4.9.2.2/scripts/upgrade.sh diff --git a/appstore/flaresolverr/3.4.1/.env b/appstore/flaresolverr/3.4.2/.env similarity index 100% rename from appstore/flaresolverr/3.4.1/.env rename to appstore/flaresolverr/3.4.2/.env diff --git a/appstore/flaresolverr/3.4.1/data.yml b/appstore/flaresolverr/3.4.2/data.yml similarity index 100% rename from appstore/flaresolverr/3.4.1/data.yml rename to appstore/flaresolverr/3.4.2/data.yml diff --git a/appstore/flaresolverr/3.4.1/docker-compose.yml b/appstore/flaresolverr/3.4.2/docker-compose.yml similarity index 93% rename from appstore/flaresolverr/3.4.1/docker-compose.yml rename to appstore/flaresolverr/3.4.2/docker-compose.yml index 20ce83645..7f0b8bb08 100644 --- a/appstore/flaresolverr/3.4.1/docker-compose.yml +++ b/appstore/flaresolverr/3.4.2/docker-compose.yml @@ -20,7 +20,7 @@ services: - HOST=0.0.0.0 - PROMETHEUS_ENABLED=false - PROMETHEUS_PORT=8192 - image: flaresolverr/flaresolverr:v3.4.1 + image: flaresolverr/flaresolverr:v3.4.2 labels: createdBy: Apps networks: diff --git a/appstore/flaresolverr/3.4.1/envs/default.env b/appstore/flaresolverr/3.4.2/envs/default.env similarity index 100% rename from appstore/flaresolverr/3.4.1/envs/default.env rename to appstore/flaresolverr/3.4.2/envs/default.env diff --git a/appstore/flaresolverr/3.4.1/envs/global.env b/appstore/flaresolverr/3.4.2/envs/global.env similarity index 100% rename from appstore/flaresolverr/3.4.1/envs/global.env rename to appstore/flaresolverr/3.4.2/envs/global.env diff --git a/appstore/flaresolverr/3.4.1/scripts/init.sh b/appstore/flaresolverr/3.4.2/scripts/init.sh similarity index 100% rename from appstore/flaresolverr/3.4.1/scripts/init.sh rename to appstore/flaresolverr/3.4.2/scripts/init.sh diff --git a/appstore/flaresolverr/3.4.1/scripts/uninstall.sh b/appstore/flaresolverr/3.4.2/scripts/uninstall.sh similarity index 100% rename from appstore/flaresolverr/3.4.1/scripts/uninstall.sh rename to appstore/flaresolverr/3.4.2/scripts/uninstall.sh diff --git a/appstore/flaresolverr/3.4.1/scripts/upgrade.sh b/appstore/flaresolverr/3.4.2/scripts/upgrade.sh similarity index 100% rename from appstore/flaresolverr/3.4.1/scripts/upgrade.sh rename to appstore/flaresolverr/3.4.2/scripts/upgrade.sh diff --git a/appstore/ghost/6.2.0/.env b/appstore/ghost/6.3.0/.env similarity index 100% rename from appstore/ghost/6.2.0/.env rename to appstore/ghost/6.3.0/.env diff --git a/appstore/ghost/6.2.0/data.yml b/appstore/ghost/6.3.0/data.yml similarity index 100% rename from appstore/ghost/6.2.0/data.yml rename to appstore/ghost/6.3.0/data.yml diff --git a/appstore/ghost/6.2.0/docker-compose.yml b/appstore/ghost/6.3.0/docker-compose.yml similarity index 95% rename from appstore/ghost/6.2.0/docker-compose.yml rename to appstore/ghost/6.3.0/docker-compose.yml index b84e1b5c3..8cdc04fa9 100644 --- a/appstore/ghost/6.2.0/docker-compose.yml +++ b/appstore/ghost/6.3.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.2.0 + image: ghost:6.3.0 labels: createdBy: Apps networks: diff --git a/appstore/ghost/6.2.0/envs/default.env b/appstore/ghost/6.3.0/envs/default.env similarity index 100% rename from appstore/ghost/6.2.0/envs/default.env rename to appstore/ghost/6.3.0/envs/default.env diff --git a/appstore/ghost/6.2.0/envs/global.env b/appstore/ghost/6.3.0/envs/global.env similarity index 100% rename from appstore/ghost/6.2.0/envs/global.env rename to appstore/ghost/6.3.0/envs/global.env diff --git a/appstore/ghost/6.2.0/scripts/init.sh b/appstore/ghost/6.3.0/scripts/init.sh similarity index 100% rename from appstore/ghost/6.2.0/scripts/init.sh rename to appstore/ghost/6.3.0/scripts/init.sh diff --git a/appstore/ghost/6.2.0/scripts/uninstall.sh b/appstore/ghost/6.3.0/scripts/uninstall.sh similarity index 100% rename from appstore/ghost/6.2.0/scripts/uninstall.sh rename to appstore/ghost/6.3.0/scripts/uninstall.sh diff --git a/appstore/ghost/6.2.0/scripts/upgrade.sh b/appstore/ghost/6.3.0/scripts/upgrade.sh similarity index 100% rename from appstore/ghost/6.2.0/scripts/upgrade.sh rename to appstore/ghost/6.3.0/scripts/upgrade.sh diff --git a/appstore/weblate/5.13.3.4/.env b/appstore/weblate/5.13.3.5/.env similarity index 100% rename from appstore/weblate/5.13.3.4/.env rename to appstore/weblate/5.13.3.5/.env diff --git a/appstore/weblate/5.13.3.4/data.yml b/appstore/weblate/5.13.3.5/data.yml similarity index 100% rename from appstore/weblate/5.13.3.4/data.yml rename to appstore/weblate/5.13.3.5/data.yml diff --git a/appstore/weblate/5.13.3.4/docker-compose.yml b/appstore/weblate/5.13.3.5/docker-compose.yml similarity index 94% rename from appstore/weblate/5.13.3.4/docker-compose.yml rename to appstore/weblate/5.13.3.5/docker-compose.yml index 709a0c038..64889cbe6 100644 --- a/appstore/weblate/5.13.3.4/docker-compose.yml +++ b/appstore/weblate/5.13.3.5/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.13.3.4 + image: weblate/weblate:5.13.3.5 labels: createdBy: Apps networks: diff --git a/appstore/weblate/5.13.3.4/envs/default.env b/appstore/weblate/5.13.3.5/envs/default.env similarity index 100% rename from appstore/weblate/5.13.3.4/envs/default.env rename to appstore/weblate/5.13.3.5/envs/default.env diff --git a/appstore/weblate/5.13.3.4/envs/global.env b/appstore/weblate/5.13.3.5/envs/global.env similarity index 100% rename from appstore/weblate/5.13.3.4/envs/global.env rename to appstore/weblate/5.13.3.5/envs/global.env diff --git a/appstore/weblate/5.13.3.4/scripts/init.sh b/appstore/weblate/5.13.3.5/scripts/init.sh similarity index 100% rename from appstore/weblate/5.13.3.4/scripts/init.sh rename to appstore/weblate/5.13.3.5/scripts/init.sh diff --git a/appstore/weblate/5.13.3.4/scripts/uninstall.sh b/appstore/weblate/5.13.3.5/scripts/uninstall.sh similarity index 100% rename from appstore/weblate/5.13.3.4/scripts/uninstall.sh rename to appstore/weblate/5.13.3.5/scripts/uninstall.sh diff --git a/appstore/weblate/5.13.3.4/scripts/upgrade.sh b/appstore/weblate/5.13.3.5/scripts/upgrade.sh similarity index 100% rename from appstore/weblate/5.13.3.4/scripts/upgrade.sh rename to appstore/weblate/5.13.3.5/scripts/upgrade.sh diff --git a/dockge/beszel-agent/docker-compose.yml b/dockge/beszel-agent/docker-compose.yml index 7b7cf4e4a..50f2d3fde 100644 --- a/dockge/beszel-agent/docker-compose.yml +++ b/dockge/beszel-agent/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - LOG_LEVEL=info - PORT=${PANEL_APP_PORT_HTTP:-45876} - image: henrygd/beszel-agent:0.13.1 + image: henrygd/beszel-agent:0.13.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/dockge/beszel/docker-compose.yml b/dockge/beszel/docker-compose.yml index 17847c415..fa9647aed 100644 --- a/dockge/beszel/docker-compose.yml +++ b/dockge/beszel/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: henrygd/beszel:0.13.1 + image: henrygd/beszel:0.13.2 labels: createdBy: Apps networks: diff --git a/dockge/clouddrive2/docker-compose.yml b/dockge/clouddrive2/docker-compose.yml index c4331d444..33543f258 100644 --- a/dockge/clouddrive2/docker-compose.yml +++ b/dockge/clouddrive2/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - TZ=Asia/Shanghai - CLOUDDRIVE_HOME=/Config - image: cloudnas/clouddrive2:0.9.8 + image: cloudnas/clouddrive2:0.9.9 labels: createdBy: Apps networks: diff --git a/dockge/emby_4_9_2_1/.env b/dockge/emby_4_9_2_2/.env similarity index 100% rename from dockge/emby_4_9_2_1/.env rename to dockge/emby_4_9_2_2/.env diff --git a/appstore/emby/4.9.2.1/docker-compose.yml b/dockge/emby_4_9_2_2/docker-compose.yml similarity index 96% rename from appstore/emby/4.9.2.1/docker-compose.yml rename to dockge/emby_4_9_2_2/docker-compose.yml index 73b330c12..fd43b5f8e 100644 --- a/appstore/emby/4.9.2.1/docker-compose.yml +++ b/dockge/emby_4_9_2_2/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.1 + image: emby/embyserver:4.9.2.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_1/envs/default.env b/dockge/emby_4_9_2_2/envs/default.env similarity index 100% rename from dockge/emby_4_9_2_1/envs/default.env rename to dockge/emby_4_9_2_2/envs/default.env diff --git a/dockge/emby_4_9_2_1/envs/global.env b/dockge/emby_4_9_2_2/envs/global.env similarity index 100% rename from dockge/emby_4_9_2_1/envs/global.env rename to dockge/emby_4_9_2_2/envs/global.env diff --git a/dockge/flaresolverr/docker-compose.yml b/dockge/flaresolverr/docker-compose.yml index 20ce83645..7f0b8bb08 100644 --- a/dockge/flaresolverr/docker-compose.yml +++ b/dockge/flaresolverr/docker-compose.yml @@ -20,7 +20,7 @@ services: - HOST=0.0.0.0 - PROMETHEUS_ENABLED=false - PROMETHEUS_PORT=8192 - image: flaresolverr/flaresolverr:v3.4.1 + image: flaresolverr/flaresolverr:v3.4.2 labels: createdBy: Apps networks: diff --git a/dockge/ghost/docker-compose.yml b/dockge/ghost/docker-compose.yml index b84e1b5c3..8cdc04fa9 100644 --- a/dockge/ghost/docker-compose.yml +++ b/dockge/ghost/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.2.0 + image: ghost:6.3.0 labels: createdBy: Apps networks: diff --git a/dockge/weblate/docker-compose.yml b/dockge/weblate/docker-compose.yml index 709a0c038..64889cbe6 100644 --- a/dockge/weblate/docker-compose.yml +++ b/dockge/weblate/docker-compose.yml @@ -16,7 +16,7 @@ services: - WEBLATE_ALLOWED_HOSTS=* - POSTGRES_DATABASE=weblate - CLIENT_MAX_BODY_SIZE=200M - image: weblate/weblate:5.13.3.4 + image: weblate/weblate:5.13.3.5 labels: createdBy: Apps networks: From be7b0f3307ff806c16472acb92d14047ccbcb86f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 00:40:09 +0000 Subject: [PATCH 041/262] Update ollama/ollama Docker tag to v0.12.4 --- apps/ollama/0.12.3/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ollama/0.12.3/docker-compose.yml b/apps/ollama/0.12.3/docker-compose.yml index 76425ff02..2ed84b022 100644 --- a/apps/ollama/0.12.3/docker-compose.yml +++ b/apps/ollama/0.12.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ollama: - image: ollama/ollama:0.12.3 + image: ollama/ollama:0.12.4 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 0911923d6d7ec0fc7652dbdf2dafde6016511050 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 00:40:20 +0000 Subject: [PATCH 042/262] Update app version [skip ci] --- apps/ollama/{0.12.3 => 0.12.4}/data.yml | 0 apps/ollama/{0.12.3 => 0.12.4}/docker-compose.yml | 0 apps/ollama/{0.12.3 => 0.12.4}/envs/default.env | 0 apps/ollama/{0.12.3 => 0.12.4}/envs/global.env | 0 apps/ollama/{0.12.3 => 0.12.4}/scripts/init.sh | 0 apps/ollama/{0.12.3 => 0.12.4}/scripts/uninstall.sh | 0 apps/ollama/{0.12.3 => 0.12.4}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ollama/{0.12.3 => 0.12.4}/data.yml (100%) rename apps/ollama/{0.12.3 => 0.12.4}/docker-compose.yml (100%) rename apps/ollama/{0.12.3 => 0.12.4}/envs/default.env (100%) rename apps/ollama/{0.12.3 => 0.12.4}/envs/global.env (100%) rename apps/ollama/{0.12.3 => 0.12.4}/scripts/init.sh (100%) rename apps/ollama/{0.12.3 => 0.12.4}/scripts/uninstall.sh (100%) rename apps/ollama/{0.12.3 => 0.12.4}/scripts/upgrade.sh (100%) diff --git a/apps/ollama/0.12.3/data.yml b/apps/ollama/0.12.4/data.yml similarity index 100% rename from apps/ollama/0.12.3/data.yml rename to apps/ollama/0.12.4/data.yml diff --git a/apps/ollama/0.12.3/docker-compose.yml b/apps/ollama/0.12.4/docker-compose.yml similarity index 100% rename from apps/ollama/0.12.3/docker-compose.yml rename to apps/ollama/0.12.4/docker-compose.yml diff --git a/apps/ollama/0.12.3/envs/default.env b/apps/ollama/0.12.4/envs/default.env similarity index 100% rename from apps/ollama/0.12.3/envs/default.env rename to apps/ollama/0.12.4/envs/default.env diff --git a/apps/ollama/0.12.3/envs/global.env b/apps/ollama/0.12.4/envs/global.env similarity index 100% rename from apps/ollama/0.12.3/envs/global.env rename to apps/ollama/0.12.4/envs/global.env diff --git a/apps/ollama/0.12.3/scripts/init.sh b/apps/ollama/0.12.4/scripts/init.sh similarity index 100% rename from apps/ollama/0.12.3/scripts/init.sh rename to apps/ollama/0.12.4/scripts/init.sh diff --git a/apps/ollama/0.12.3/scripts/uninstall.sh b/apps/ollama/0.12.4/scripts/uninstall.sh similarity index 100% rename from apps/ollama/0.12.3/scripts/uninstall.sh rename to apps/ollama/0.12.4/scripts/uninstall.sh diff --git a/apps/ollama/0.12.3/scripts/upgrade.sh b/apps/ollama/0.12.4/scripts/upgrade.sh similarity index 100% rename from apps/ollama/0.12.3/scripts/upgrade.sh rename to apps/ollama/0.12.4/scripts/upgrade.sh From 5a847da093b504e57e46178ddcc1af667008c2e6 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 01:40:18 +0000 Subject: [PATCH 043/262] Processed apps directory via GitHub Actions --- appstore/ollama/{0.12.3 => 0.12.4}/.env | 0 appstore/ollama/{0.12.3 => 0.12.4}/data.yml | 0 appstore/ollama/{0.12.3 => 0.12.4}/docker-compose.yml | 2 +- appstore/ollama/{0.12.3 => 0.12.4}/envs/default.env | 0 appstore/ollama/{0.12.3 => 0.12.4}/envs/global.env | 0 appstore/ollama/{0.12.3 => 0.12.4}/scripts/init.sh | 0 appstore/ollama/{0.12.3 => 0.12.4}/scripts/uninstall.sh | 0 appstore/ollama/{0.12.3 => 0.12.4}/scripts/upgrade.sh | 0 dockge/ollama/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/ollama/{0.12.3 => 0.12.4}/.env (100%) rename appstore/ollama/{0.12.3 => 0.12.4}/data.yml (100%) rename appstore/ollama/{0.12.3 => 0.12.4}/docker-compose.yml (95%) rename appstore/ollama/{0.12.3 => 0.12.4}/envs/default.env (100%) rename appstore/ollama/{0.12.3 => 0.12.4}/envs/global.env (100%) rename appstore/ollama/{0.12.3 => 0.12.4}/scripts/init.sh (100%) rename appstore/ollama/{0.12.3 => 0.12.4}/scripts/uninstall.sh (100%) rename appstore/ollama/{0.12.3 => 0.12.4}/scripts/upgrade.sh (100%) diff --git a/appstore/ollama/0.12.3/.env b/appstore/ollama/0.12.4/.env similarity index 100% rename from appstore/ollama/0.12.3/.env rename to appstore/ollama/0.12.4/.env diff --git a/appstore/ollama/0.12.3/data.yml b/appstore/ollama/0.12.4/data.yml similarity index 100% rename from appstore/ollama/0.12.3/data.yml rename to appstore/ollama/0.12.4/data.yml diff --git a/appstore/ollama/0.12.3/docker-compose.yml b/appstore/ollama/0.12.4/docker-compose.yml similarity index 95% rename from appstore/ollama/0.12.3/docker-compose.yml rename to appstore/ollama/0.12.4/docker-compose.yml index ae0d0aa11..d9bed0a31 100644 --- a/appstore/ollama/0.12.3/docker-compose.yml +++ b/appstore/ollama/0.12.4/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.12.3 + image: ollama/ollama:0.12.4 labels: createdBy: Apps networks: diff --git a/appstore/ollama/0.12.3/envs/default.env b/appstore/ollama/0.12.4/envs/default.env similarity index 100% rename from appstore/ollama/0.12.3/envs/default.env rename to appstore/ollama/0.12.4/envs/default.env diff --git a/appstore/ollama/0.12.3/envs/global.env b/appstore/ollama/0.12.4/envs/global.env similarity index 100% rename from appstore/ollama/0.12.3/envs/global.env rename to appstore/ollama/0.12.4/envs/global.env diff --git a/appstore/ollama/0.12.3/scripts/init.sh b/appstore/ollama/0.12.4/scripts/init.sh similarity index 100% rename from appstore/ollama/0.12.3/scripts/init.sh rename to appstore/ollama/0.12.4/scripts/init.sh diff --git a/appstore/ollama/0.12.3/scripts/uninstall.sh b/appstore/ollama/0.12.4/scripts/uninstall.sh similarity index 100% rename from appstore/ollama/0.12.3/scripts/uninstall.sh rename to appstore/ollama/0.12.4/scripts/uninstall.sh diff --git a/appstore/ollama/0.12.3/scripts/upgrade.sh b/appstore/ollama/0.12.4/scripts/upgrade.sh similarity index 100% rename from appstore/ollama/0.12.3/scripts/upgrade.sh rename to appstore/ollama/0.12.4/scripts/upgrade.sh diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml index ae0d0aa11..d9bed0a31 100644 --- a/dockge/ollama/docker-compose.yml +++ b/dockge/ollama/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.12.3 + image: ollama/ollama:0.12.4 labels: createdBy: Apps networks: From dcfd3d3cfdbb6ac2a90162f10beee66d9da3c4e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 03:00:37 +0000 Subject: [PATCH 044/262] Update ghcr.io/nezhahq/nezha Docker tag to v1.14.9 --- apps/nezha/1.14.8/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha/1.14.8/docker-compose.yml b/apps/nezha/1.14.8/docker-compose.yml index 4860904e2..c9cee9f9b 100644 --- a/apps/nezha/1.14.8/docker-compose.yml +++ b/apps/nezha/1.14.8/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha: - image: ghcr.io/nezhahq/nezha:v1.14.8 + image: ghcr.io/nezhahq/nezha:v1.14.9 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 179afd1c110559e75dd4e9779e2f2e4bf09ed84c Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 03:00:46 +0000 Subject: [PATCH 045/262] Update app version [skip ci] --- apps/nezha/{1.14.8 => 1.14.9}/data.yml | 0 apps/nezha/{1.14.8 => 1.14.9}/data/config-example.yaml | 0 apps/nezha/{1.14.8 => 1.14.9}/docker-compose.yml | 0 apps/nezha/{1.14.8 => 1.14.9}/envs/default.env | 0 apps/nezha/{1.14.8 => 1.14.9}/envs/global.env | 0 apps/nezha/{1.14.8 => 1.14.9}/scripts/init.sh | 0 apps/nezha/{1.14.8 => 1.14.9}/scripts/uninstall.sh | 0 apps/nezha/{1.14.8 => 1.14.9}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha/{1.14.8 => 1.14.9}/data.yml (100%) rename apps/nezha/{1.14.8 => 1.14.9}/data/config-example.yaml (100%) rename apps/nezha/{1.14.8 => 1.14.9}/docker-compose.yml (100%) rename apps/nezha/{1.14.8 => 1.14.9}/envs/default.env (100%) rename apps/nezha/{1.14.8 => 1.14.9}/envs/global.env (100%) rename apps/nezha/{1.14.8 => 1.14.9}/scripts/init.sh (100%) rename apps/nezha/{1.14.8 => 1.14.9}/scripts/uninstall.sh (100%) rename apps/nezha/{1.14.8 => 1.14.9}/scripts/upgrade.sh (100%) diff --git a/apps/nezha/1.14.8/data.yml b/apps/nezha/1.14.9/data.yml similarity index 100% rename from apps/nezha/1.14.8/data.yml rename to apps/nezha/1.14.9/data.yml diff --git a/apps/nezha/1.14.8/data/config-example.yaml b/apps/nezha/1.14.9/data/config-example.yaml similarity index 100% rename from apps/nezha/1.14.8/data/config-example.yaml rename to apps/nezha/1.14.9/data/config-example.yaml diff --git a/apps/nezha/1.14.8/docker-compose.yml b/apps/nezha/1.14.9/docker-compose.yml similarity index 100% rename from apps/nezha/1.14.8/docker-compose.yml rename to apps/nezha/1.14.9/docker-compose.yml diff --git a/apps/nezha/1.14.8/envs/default.env b/apps/nezha/1.14.9/envs/default.env similarity index 100% rename from apps/nezha/1.14.8/envs/default.env rename to apps/nezha/1.14.9/envs/default.env diff --git a/apps/nezha/1.14.8/envs/global.env b/apps/nezha/1.14.9/envs/global.env similarity index 100% rename from apps/nezha/1.14.8/envs/global.env rename to apps/nezha/1.14.9/envs/global.env diff --git a/apps/nezha/1.14.8/scripts/init.sh b/apps/nezha/1.14.9/scripts/init.sh similarity index 100% rename from apps/nezha/1.14.8/scripts/init.sh rename to apps/nezha/1.14.9/scripts/init.sh diff --git a/apps/nezha/1.14.8/scripts/uninstall.sh b/apps/nezha/1.14.9/scripts/uninstall.sh similarity index 100% rename from apps/nezha/1.14.8/scripts/uninstall.sh rename to apps/nezha/1.14.9/scripts/uninstall.sh diff --git a/apps/nezha/1.14.8/scripts/upgrade.sh b/apps/nezha/1.14.9/scripts/upgrade.sh similarity index 100% rename from apps/nezha/1.14.8/scripts/upgrade.sh rename to apps/nezha/1.14.9/scripts/upgrade.sh From 802a17f4185828cba2a5799e6c40ab225911fb01 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 03:33:26 +0000 Subject: [PATCH 046/262] Processed apps directory via GitHub Actions --- appstore/nezha/{1.14.8 => 1.14.9}/.env | 0 appstore/nezha/{1.14.8 => 1.14.9}/data.yml | 0 .../data/config-example.yaml | 0 .../{1.14.8 => 1.14.9}/docker-compose.yml | 2 +- .../nezha/{1.14.8 => 1.14.9}/envs/default.env | 0 .../nezha/{1.14.8 => 1.14.9}/envs/global.env | 0 .../nezha/{1.14.8 => 1.14.9}/scripts/init.sh | 0 .../{1.14.8 => 1.14.9}/scripts/uninstall.sh | 0 .../{1.14.8 => 1.14.9}/scripts/upgrade.sh | 0 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 --------- dockge/nezha_1_14_9/.env | 42 +++++++++++++++++++ dockge/nezha_1_14_9/data/config-example.yaml | 6 +++ dockge/nezha_1_14_9/docker-compose.yml | 19 +++++++++ .../envs/default.env | 0 .../envs/global.env | 0 20 files changed, 120 insertions(+), 120 deletions(-) rename appstore/nezha/{1.14.8 => 1.14.9}/.env (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/data.yml (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/data/config-example.yaml (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/docker-compose.yml (90%) rename appstore/nezha/{1.14.8 => 1.14.9}/envs/default.env (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/envs/global.env (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/scripts/init.sh (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/scripts/uninstall.sh (100%) rename appstore/nezha/{1.14.8 => 1.14.9}/scripts/upgrade.sh (100%) delete mode 100644 dockge/nezha_0_20_13/.env delete mode 100644 dockge/nezha_0_20_13/data/config-example.yaml delete mode 100644 dockge/nezha_0_20_13/docker-compose.yml create mode 100644 dockge/nezha_1_14_9/.env create mode 100644 dockge/nezha_1_14_9/data/config-example.yaml create mode 100644 dockge/nezha_1_14_9/docker-compose.yml rename dockge/{nezha_0_20_13 => nezha_1_14_9}/envs/default.env (100%) rename dockge/{nezha_0_20_13 => nezha_1_14_9}/envs/global.env (100%) diff --git a/appstore/nezha/1.14.8/.env b/appstore/nezha/1.14.9/.env similarity index 100% rename from appstore/nezha/1.14.8/.env rename to appstore/nezha/1.14.9/.env diff --git a/appstore/nezha/1.14.8/data.yml b/appstore/nezha/1.14.9/data.yml similarity index 100% rename from appstore/nezha/1.14.8/data.yml rename to appstore/nezha/1.14.9/data.yml diff --git a/appstore/nezha/1.14.8/data/config-example.yaml b/appstore/nezha/1.14.9/data/config-example.yaml similarity index 100% rename from appstore/nezha/1.14.8/data/config-example.yaml rename to appstore/nezha/1.14.9/data/config-example.yaml diff --git a/appstore/nezha/1.14.8/docker-compose.yml b/appstore/nezha/1.14.9/docker-compose.yml similarity index 90% rename from appstore/nezha/1.14.8/docker-compose.yml rename to appstore/nezha/1.14.9/docker-compose.yml index 563c3056a..0a11135a7 100644 --- a/appstore/nezha/1.14.8/docker-compose.yml +++ b/appstore/nezha/1.14.9/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.8 + image: ghcr.io/nezhahq/nezha:v1.14.9 labels: createdBy: Apps networks: diff --git a/appstore/nezha/1.14.8/envs/default.env b/appstore/nezha/1.14.9/envs/default.env similarity index 100% rename from appstore/nezha/1.14.8/envs/default.env rename to appstore/nezha/1.14.9/envs/default.env diff --git a/appstore/nezha/1.14.8/envs/global.env b/appstore/nezha/1.14.9/envs/global.env similarity index 100% rename from appstore/nezha/1.14.8/envs/global.env rename to appstore/nezha/1.14.9/envs/global.env diff --git a/appstore/nezha/1.14.8/scripts/init.sh b/appstore/nezha/1.14.9/scripts/init.sh similarity index 100% rename from appstore/nezha/1.14.8/scripts/init.sh rename to appstore/nezha/1.14.9/scripts/init.sh diff --git a/appstore/nezha/1.14.8/scripts/uninstall.sh b/appstore/nezha/1.14.9/scripts/uninstall.sh similarity index 100% rename from appstore/nezha/1.14.8/scripts/uninstall.sh rename to appstore/nezha/1.14.9/scripts/uninstall.sh diff --git a/appstore/nezha/1.14.8/scripts/upgrade.sh b/appstore/nezha/1.14.9/scripts/upgrade.sh similarity index 100% rename from appstore/nezha/1.14.8/scripts/upgrade.sh rename to appstore/nezha/1.14.9/scripts/upgrade.sh diff --git a/dockge/nezha/.env b/dockge/nezha/.env index 6adf2af10..54509260f 100644 --- a/dockge/nezha/.env +++ b/dockge/nezha/.env @@ -4,39 +4,30 @@ NEZHA_ROOT_PATH=/home/nezha # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=8008 -# 系统语言 [必填] -NZ_LANGUAGE=zh_CN - -# 数据持久化路径 [必填] -NZ_SITE_NAME=哪吒监控 - -# Agent是否启用TLS [必填] -NZ_TLS=false +# gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=5555 # OAuth 服务商 [必填] -NZ_OAUTH2_TYPE=github +OAUTH2_TYPE=github # 管理员账号ID [必填] -NZ_OAUTH2_ADMIN= +OAUTH2_ADMIN= # OAuth 客户端 ID [必填] -NZ_OAUTH2_CLIENTID= +OAUTH2_CLIENTID= # OAuth 客户端 Secret [必填] -NZ_OAUTH2_CLIENTSECRET= +OAUTH2_CLIENTSECRET= # OAuth 端点 (可选) -NZ_OAUTH2_ENDPOINT= +OAUTH2_ENDPOINT= -# 登录有效期 (小时) [必填] -NZ_JWT_TIMEOUT=1 +# 网站标题 [必填] +NZ_SITE_TITLE=哪吒监控 -# 强制认证 [必填] -NZ_FORCE_AUTH=false +# Cookie 名称 (默认) [必填] +NZ_COOKIE_NAME=nezha-dashboard -# 是否脱敏通知IP [必填] -NZ_ENABLE_PLAIN_IP_IN_NOTIFICATION=false - -# IP 变更通知 [必填] -NZ_ENABLE_IP_CHANGE_NOTIFICATION=false +# 网站主题 (默认) [必填] +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 563c3056a..ff7b23dd8 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/docker-compose.yml @@ -2,18 +2,19 @@ networks: 1panel-network: external: true services: - nezha: + nezha-dashboard: container_name: nezha - environment: - - NZ_LISTEN_PORT=${PANEL_APP_PORT_HTTP} - - NZ_LOCATION=Asia/Shanghai - image: ghcr.io/nezhahq/nezha:v1.14.8 + image: ghcr.io/naiba/nezha-dashboard:v0.20.13 labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + - ${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_1_14_9/.env b/dockge/nezha_1_14_9/.env new file mode 100644 index 000000000..6adf2af10 --- /dev/null +++ b/dockge/nezha_1_14_9/.env @@ -0,0 +1,42 @@ +# 数据持久化路径 [必填] +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_9/data/config-example.yaml b/dockge/nezha_1_14_9/data/config-example.yaml new file mode 100644 index 000000000..f9d20745b --- /dev/null +++ b/dockge/nezha_1_14_9/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_1_14_9/docker-compose.yml b/dockge/nezha_1_14_9/docker-compose.yml new file mode 100644 index 000000000..0a11135a7 --- /dev/null +++ b/dockge/nezha_1_14_9/docker-compose.yml @@ -0,0 +1,19 @@ +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.9 + 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/dockge/nezha_0_20_13/envs/default.env b/dockge/nezha_1_14_9/envs/default.env similarity index 100% rename from dockge/nezha_0_20_13/envs/default.env rename to dockge/nezha_1_14_9/envs/default.env diff --git a/dockge/nezha_0_20_13/envs/global.env b/dockge/nezha_1_14_9/envs/global.env similarity index 100% rename from dockge/nezha_0_20_13/envs/global.env rename to dockge/nezha_1_14_9/envs/global.env From f5e98ce00add18994d9381cc195fcfef21de15af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 04:18:19 +0000 Subject: [PATCH 047/262] Update sn0wl1n/ech0 Docker tag to v2.7.7 --- apps/ech0/2.7.6/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.7.6/docker-compose.yml b/apps/ech0/2.7.6/docker-compose.yml index bdeb53ba5..17d4dffaf 100644 --- a/apps/ech0/2.7.6/docker-compose.yml +++ b/apps/ech0/2.7.6/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.7.6 + image: sn0wl1n/ech0:v2.7.7 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 94b9867bc08674bb4548755b1d47639b25793b56 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 04:18:33 +0000 Subject: [PATCH 048/262] Update app version [skip ci] --- apps/ech0/{2.7.6 => 2.7.7}/data.yml | 0 apps/ech0/{2.7.6 => 2.7.7}/docker-compose.yml | 0 apps/ech0/{2.7.6 => 2.7.7}/envs/default.env | 0 apps/ech0/{2.7.6 => 2.7.7}/envs/global.env | 0 apps/ech0/{2.7.6 => 2.7.7}/scripts/init.sh | 0 apps/ech0/{2.7.6 => 2.7.7}/scripts/uninstall.sh | 0 apps/ech0/{2.7.6 => 2.7.7}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.7.6 => 2.7.7}/data.yml (100%) rename apps/ech0/{2.7.6 => 2.7.7}/docker-compose.yml (100%) rename apps/ech0/{2.7.6 => 2.7.7}/envs/default.env (100%) rename apps/ech0/{2.7.6 => 2.7.7}/envs/global.env (100%) rename apps/ech0/{2.7.6 => 2.7.7}/scripts/init.sh (100%) rename apps/ech0/{2.7.6 => 2.7.7}/scripts/uninstall.sh (100%) rename apps/ech0/{2.7.6 => 2.7.7}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.7.6/data.yml b/apps/ech0/2.7.7/data.yml similarity index 100% rename from apps/ech0/2.7.6/data.yml rename to apps/ech0/2.7.7/data.yml diff --git a/apps/ech0/2.7.6/docker-compose.yml b/apps/ech0/2.7.7/docker-compose.yml similarity index 100% rename from apps/ech0/2.7.6/docker-compose.yml rename to apps/ech0/2.7.7/docker-compose.yml diff --git a/apps/ech0/2.7.6/envs/default.env b/apps/ech0/2.7.7/envs/default.env similarity index 100% rename from apps/ech0/2.7.6/envs/default.env rename to apps/ech0/2.7.7/envs/default.env diff --git a/apps/ech0/2.7.6/envs/global.env b/apps/ech0/2.7.7/envs/global.env similarity index 100% rename from apps/ech0/2.7.6/envs/global.env rename to apps/ech0/2.7.7/envs/global.env diff --git a/apps/ech0/2.7.6/scripts/init.sh b/apps/ech0/2.7.7/scripts/init.sh similarity index 100% rename from apps/ech0/2.7.6/scripts/init.sh rename to apps/ech0/2.7.7/scripts/init.sh diff --git a/apps/ech0/2.7.6/scripts/uninstall.sh b/apps/ech0/2.7.7/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.7.6/scripts/uninstall.sh rename to apps/ech0/2.7.7/scripts/uninstall.sh diff --git a/apps/ech0/2.7.6/scripts/upgrade.sh b/apps/ech0/2.7.7/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.7.6/scripts/upgrade.sh rename to apps/ech0/2.7.7/scripts/upgrade.sh From ffcf6bfe815e31c0a32db724636407994770092b Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 06:32:19 +0000 Subject: [PATCH 049/262] Processed apps directory via GitHub Actions --- appstore/ech0/{2.7.6 => 2.7.7}/.env | 0 appstore/ech0/{2.7.6 => 2.7.7}/data.yml | 0 appstore/ech0/{2.7.6 => 2.7.7}/docker-compose.yml | 2 +- appstore/ech0/{2.7.6 => 2.7.7}/envs/default.env | 0 appstore/ech0/{2.7.6 => 2.7.7}/envs/global.env | 0 appstore/ech0/{2.7.6 => 2.7.7}/scripts/init.sh | 0 appstore/ech0/{2.7.6 => 2.7.7}/scripts/uninstall.sh | 0 appstore/ech0/{2.7.6 => 2.7.7}/scripts/upgrade.sh | 0 dockge/ech0/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/ech0/{2.7.6 => 2.7.7}/.env (100%) rename appstore/ech0/{2.7.6 => 2.7.7}/data.yml (100%) rename appstore/ech0/{2.7.6 => 2.7.7}/docker-compose.yml (93%) rename appstore/ech0/{2.7.6 => 2.7.7}/envs/default.env (100%) rename appstore/ech0/{2.7.6 => 2.7.7}/envs/global.env (100%) rename appstore/ech0/{2.7.6 => 2.7.7}/scripts/init.sh (100%) rename appstore/ech0/{2.7.6 => 2.7.7}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.7.6 => 2.7.7}/scripts/upgrade.sh (100%) diff --git a/appstore/ech0/2.7.6/.env b/appstore/ech0/2.7.7/.env similarity index 100% rename from appstore/ech0/2.7.6/.env rename to appstore/ech0/2.7.7/.env diff --git a/appstore/ech0/2.7.6/data.yml b/appstore/ech0/2.7.7/data.yml similarity index 100% rename from appstore/ech0/2.7.6/data.yml rename to appstore/ech0/2.7.7/data.yml diff --git a/appstore/ech0/2.7.6/docker-compose.yml b/appstore/ech0/2.7.7/docker-compose.yml similarity index 93% rename from appstore/ech0/2.7.6/docker-compose.yml rename to appstore/ech0/2.7.7/docker-compose.yml index a0ec11f18..dd04faef0 100644 --- a/appstore/ech0/2.7.6/docker-compose.yml +++ b/appstore/ech0/2.7.7/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.6 + image: sn0wl1n/ech0:v2.7.7 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.7.6/envs/default.env b/appstore/ech0/2.7.7/envs/default.env similarity index 100% rename from appstore/ech0/2.7.6/envs/default.env rename to appstore/ech0/2.7.7/envs/default.env diff --git a/appstore/ech0/2.7.6/envs/global.env b/appstore/ech0/2.7.7/envs/global.env similarity index 100% rename from appstore/ech0/2.7.6/envs/global.env rename to appstore/ech0/2.7.7/envs/global.env diff --git a/appstore/ech0/2.7.6/scripts/init.sh b/appstore/ech0/2.7.7/scripts/init.sh similarity index 100% rename from appstore/ech0/2.7.6/scripts/init.sh rename to appstore/ech0/2.7.7/scripts/init.sh diff --git a/appstore/ech0/2.7.6/scripts/uninstall.sh b/appstore/ech0/2.7.7/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.7.6/scripts/uninstall.sh rename to appstore/ech0/2.7.7/scripts/uninstall.sh diff --git a/appstore/ech0/2.7.6/scripts/upgrade.sh b/appstore/ech0/2.7.7/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.7.6/scripts/upgrade.sh rename to appstore/ech0/2.7.7/scripts/upgrade.sh diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index a0ec11f18..dd04faef0 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.6 + image: sn0wl1n/ech0:v2.7.7 labels: createdBy: Apps networks: From be6c74f99c9415de488533a31a27397dffe6b246 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 12:37:43 +0000 Subject: [PATCH 050/262] Update 1panel/maxkb Docker tag to v2.2.1 --- apps/maxkb/2.2.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/maxkb/2.2.0/docker-compose.yml b/apps/maxkb/2.2.0/docker-compose.yml index ab9491e01..3edf7ee26 100644 --- a/apps/maxkb/2.2.0/docker-compose.yml +++ b/apps/maxkb/2.2.0/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: maxkb: - image: 1panel/maxkb:v2.2.0 + image: 1panel/maxkb:v2.2.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From dbbaa8d22eb3b869e47b4d3311172beb717138d5 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 12:37:53 +0000 Subject: [PATCH 051/262] Update app version [skip ci] --- apps/maxkb/{2.2.0 => 2.2.1}/data.yml | 0 apps/maxkb/{2.2.0 => 2.2.1}/docker-compose.yml | 0 apps/maxkb/{2.2.0 => 2.2.1}/envs/default.env | 0 apps/maxkb/{2.2.0 => 2.2.1}/envs/global.env | 0 apps/maxkb/{2.2.0 => 2.2.1}/scripts/init.sh | 0 apps/maxkb/{2.2.0 => 2.2.1}/scripts/uninstall.sh | 0 apps/maxkb/{2.2.0 => 2.2.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/maxkb/{2.2.0 => 2.2.1}/data.yml (100%) rename apps/maxkb/{2.2.0 => 2.2.1}/docker-compose.yml (100%) rename apps/maxkb/{2.2.0 => 2.2.1}/envs/default.env (100%) rename apps/maxkb/{2.2.0 => 2.2.1}/envs/global.env (100%) rename apps/maxkb/{2.2.0 => 2.2.1}/scripts/init.sh (100%) rename apps/maxkb/{2.2.0 => 2.2.1}/scripts/uninstall.sh (100%) rename apps/maxkb/{2.2.0 => 2.2.1}/scripts/upgrade.sh (100%) diff --git a/apps/maxkb/2.2.0/data.yml b/apps/maxkb/2.2.1/data.yml similarity index 100% rename from apps/maxkb/2.2.0/data.yml rename to apps/maxkb/2.2.1/data.yml diff --git a/apps/maxkb/2.2.0/docker-compose.yml b/apps/maxkb/2.2.1/docker-compose.yml similarity index 100% rename from apps/maxkb/2.2.0/docker-compose.yml rename to apps/maxkb/2.2.1/docker-compose.yml diff --git a/apps/maxkb/2.2.0/envs/default.env b/apps/maxkb/2.2.1/envs/default.env similarity index 100% rename from apps/maxkb/2.2.0/envs/default.env rename to apps/maxkb/2.2.1/envs/default.env diff --git a/apps/maxkb/2.2.0/envs/global.env b/apps/maxkb/2.2.1/envs/global.env similarity index 100% rename from apps/maxkb/2.2.0/envs/global.env rename to apps/maxkb/2.2.1/envs/global.env diff --git a/apps/maxkb/2.2.0/scripts/init.sh b/apps/maxkb/2.2.1/scripts/init.sh similarity index 100% rename from apps/maxkb/2.2.0/scripts/init.sh rename to apps/maxkb/2.2.1/scripts/init.sh diff --git a/apps/maxkb/2.2.0/scripts/uninstall.sh b/apps/maxkb/2.2.1/scripts/uninstall.sh similarity index 100% rename from apps/maxkb/2.2.0/scripts/uninstall.sh rename to apps/maxkb/2.2.1/scripts/uninstall.sh diff --git a/apps/maxkb/2.2.0/scripts/upgrade.sh b/apps/maxkb/2.2.1/scripts/upgrade.sh similarity index 100% rename from apps/maxkb/2.2.0/scripts/upgrade.sh rename to apps/maxkb/2.2.1/scripts/upgrade.sh From bf0a127f407fe39cdf6c964f7178c95f5db1c8bd Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 12:43:17 +0000 Subject: [PATCH 052/262] Processed apps directory via GitHub Actions --- appstore/maxkb/{2.2.0 => 2.2.1}/.env | 0 appstore/maxkb/{2.2.0 => 2.2.1}/data.yml | 0 appstore/maxkb/{2.2.0 => 2.2.1}/docker-compose.yml | 2 +- appstore/maxkb/{2.2.0 => 2.2.1}/envs/default.env | 0 appstore/maxkb/{2.2.0 => 2.2.1}/envs/global.env | 0 appstore/maxkb/{2.2.0 => 2.2.1}/scripts/init.sh | 0 appstore/maxkb/{2.2.0 => 2.2.1}/scripts/uninstall.sh | 0 appstore/maxkb/{2.2.0 => 2.2.1}/scripts/upgrade.sh | 0 dockge/maxkb/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/maxkb/{2.2.0 => 2.2.1}/.env (100%) rename appstore/maxkb/{2.2.0 => 2.2.1}/data.yml (100%) rename appstore/maxkb/{2.2.0 => 2.2.1}/docker-compose.yml (94%) rename appstore/maxkb/{2.2.0 => 2.2.1}/envs/default.env (100%) rename appstore/maxkb/{2.2.0 => 2.2.1}/envs/global.env (100%) rename appstore/maxkb/{2.2.0 => 2.2.1}/scripts/init.sh (100%) rename appstore/maxkb/{2.2.0 => 2.2.1}/scripts/uninstall.sh (100%) rename appstore/maxkb/{2.2.0 => 2.2.1}/scripts/upgrade.sh (100%) diff --git a/appstore/maxkb/2.2.0/.env b/appstore/maxkb/2.2.1/.env similarity index 100% rename from appstore/maxkb/2.2.0/.env rename to appstore/maxkb/2.2.1/.env diff --git a/appstore/maxkb/2.2.0/data.yml b/appstore/maxkb/2.2.1/data.yml similarity index 100% rename from appstore/maxkb/2.2.0/data.yml rename to appstore/maxkb/2.2.1/data.yml diff --git a/appstore/maxkb/2.2.0/docker-compose.yml b/appstore/maxkb/2.2.1/docker-compose.yml similarity index 94% rename from appstore/maxkb/2.2.0/docker-compose.yml rename to appstore/maxkb/2.2.1/docker-compose.yml index 18b12d9d5..e046dbbf2 100644 --- a/appstore/maxkb/2.2.0/docker-compose.yml +++ b/appstore/maxkb/2.2.1/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: 1panel/maxkb:v2.2.0 + image: 1panel/maxkb:v2.2.1 labels: createdBy: Apps networks: diff --git a/appstore/maxkb/2.2.0/envs/default.env b/appstore/maxkb/2.2.1/envs/default.env similarity index 100% rename from appstore/maxkb/2.2.0/envs/default.env rename to appstore/maxkb/2.2.1/envs/default.env diff --git a/appstore/maxkb/2.2.0/envs/global.env b/appstore/maxkb/2.2.1/envs/global.env similarity index 100% rename from appstore/maxkb/2.2.0/envs/global.env rename to appstore/maxkb/2.2.1/envs/global.env diff --git a/appstore/maxkb/2.2.0/scripts/init.sh b/appstore/maxkb/2.2.1/scripts/init.sh similarity index 100% rename from appstore/maxkb/2.2.0/scripts/init.sh rename to appstore/maxkb/2.2.1/scripts/init.sh diff --git a/appstore/maxkb/2.2.0/scripts/uninstall.sh b/appstore/maxkb/2.2.1/scripts/uninstall.sh similarity index 100% rename from appstore/maxkb/2.2.0/scripts/uninstall.sh rename to appstore/maxkb/2.2.1/scripts/uninstall.sh diff --git a/appstore/maxkb/2.2.0/scripts/upgrade.sh b/appstore/maxkb/2.2.1/scripts/upgrade.sh similarity index 100% rename from appstore/maxkb/2.2.0/scripts/upgrade.sh rename to appstore/maxkb/2.2.1/scripts/upgrade.sh diff --git a/dockge/maxkb/docker-compose.yml b/dockge/maxkb/docker-compose.yml index 18b12d9d5..e046dbbf2 100644 --- a/dockge/maxkb/docker-compose.yml +++ b/dockge/maxkb/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: 1panel/maxkb:v2.2.0 + image: 1panel/maxkb:v2.2.1 labels: createdBy: Apps networks: From 1aceb398167bbbc96b8de437cf4c18ee9686397d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 13:24:58 +0000 Subject: [PATCH 053/262] Update n8nio/n8n Docker tag to v1.115.2 --- apps/n8n/1.115.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/n8n/1.115.1/docker-compose.yml b/apps/n8n/1.115.1/docker-compose.yml index cc4683fa7..30092ae21 100644 --- a/apps/n8n/1.115.1/docker-compose.yml +++ b/apps/n8n/1.115.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: n8n: - image: n8nio/n8n:1.115.1 + image: n8nio/n8n:1.115.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From e70b8d7875ea3083fe37de56ba441788bfd5c653 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 13:25:04 +0000 Subject: [PATCH 054/262] Update wushuo894/ani-rss Docker tag to v2.2.14 --- apps/ani-rss/2.2.13/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/2.2.13/docker-compose.yml b/apps/ani-rss/2.2.13/docker-compose.yml index f2a61a760..788bdd0d5 100644 --- a/apps/ani-rss/2.2.13/docker-compose.yml +++ b/apps/ani-rss/2.2.13/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.2.13 + image: wushuo894/ani-rss:v2.2.14 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 8c60d6024b983b5591e1b2b316298dbb4bdd3aee Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 13:25:12 +0000 Subject: [PATCH 055/262] Update app version [skip ci] --- apps/n8n/{1.115.1 => 1.115.2}/data.yml | 0 apps/n8n/{1.115.1 => 1.115.2}/docker-compose.yml | 0 apps/n8n/{1.115.1 => 1.115.2}/envs/default.env | 0 apps/n8n/{1.115.1 => 1.115.2}/envs/global.env | 0 apps/n8n/{1.115.1 => 1.115.2}/scripts/init.sh | 0 apps/n8n/{1.115.1 => 1.115.2}/scripts/uninstall.sh | 0 apps/n8n/{1.115.1 => 1.115.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/n8n/{1.115.1 => 1.115.2}/data.yml (100%) rename apps/n8n/{1.115.1 => 1.115.2}/docker-compose.yml (100%) rename apps/n8n/{1.115.1 => 1.115.2}/envs/default.env (100%) rename apps/n8n/{1.115.1 => 1.115.2}/envs/global.env (100%) rename apps/n8n/{1.115.1 => 1.115.2}/scripts/init.sh (100%) rename apps/n8n/{1.115.1 => 1.115.2}/scripts/uninstall.sh (100%) rename apps/n8n/{1.115.1 => 1.115.2}/scripts/upgrade.sh (100%) diff --git a/apps/n8n/1.115.1/data.yml b/apps/n8n/1.115.2/data.yml similarity index 100% rename from apps/n8n/1.115.1/data.yml rename to apps/n8n/1.115.2/data.yml diff --git a/apps/n8n/1.115.1/docker-compose.yml b/apps/n8n/1.115.2/docker-compose.yml similarity index 100% rename from apps/n8n/1.115.1/docker-compose.yml rename to apps/n8n/1.115.2/docker-compose.yml diff --git a/apps/n8n/1.115.1/envs/default.env b/apps/n8n/1.115.2/envs/default.env similarity index 100% rename from apps/n8n/1.115.1/envs/default.env rename to apps/n8n/1.115.2/envs/default.env diff --git a/apps/n8n/1.115.1/envs/global.env b/apps/n8n/1.115.2/envs/global.env similarity index 100% rename from apps/n8n/1.115.1/envs/global.env rename to apps/n8n/1.115.2/envs/global.env diff --git a/apps/n8n/1.115.1/scripts/init.sh b/apps/n8n/1.115.2/scripts/init.sh similarity index 100% rename from apps/n8n/1.115.1/scripts/init.sh rename to apps/n8n/1.115.2/scripts/init.sh diff --git a/apps/n8n/1.115.1/scripts/uninstall.sh b/apps/n8n/1.115.2/scripts/uninstall.sh similarity index 100% rename from apps/n8n/1.115.1/scripts/uninstall.sh rename to apps/n8n/1.115.2/scripts/uninstall.sh diff --git a/apps/n8n/1.115.1/scripts/upgrade.sh b/apps/n8n/1.115.2/scripts/upgrade.sh similarity index 100% rename from apps/n8n/1.115.1/scripts/upgrade.sh rename to apps/n8n/1.115.2/scripts/upgrade.sh From 2a5243f79011bbf80197afb3b43541e1cbbf4c98 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 13:25:17 +0000 Subject: [PATCH 056/262] Update app version [skip ci] --- apps/ani-rss/{2.2.13 => 2.2.14}/data.yml | 0 apps/ani-rss/{2.2.13 => 2.2.14}/docker-compose.yml | 0 apps/ani-rss/{2.2.13 => 2.2.14}/envs/default.env | 0 apps/ani-rss/{2.2.13 => 2.2.14}/envs/global.env | 0 apps/ani-rss/{2.2.13 => 2.2.14}/scripts/init.sh | 0 apps/ani-rss/{2.2.13 => 2.2.14}/scripts/uninstall.sh | 0 apps/ani-rss/{2.2.13 => 2.2.14}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{2.2.13 => 2.2.14}/data.yml (100%) rename apps/ani-rss/{2.2.13 => 2.2.14}/docker-compose.yml (100%) rename apps/ani-rss/{2.2.13 => 2.2.14}/envs/default.env (100%) rename apps/ani-rss/{2.2.13 => 2.2.14}/envs/global.env (100%) rename apps/ani-rss/{2.2.13 => 2.2.14}/scripts/init.sh (100%) rename apps/ani-rss/{2.2.13 => 2.2.14}/scripts/uninstall.sh (100%) rename apps/ani-rss/{2.2.13 => 2.2.14}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/2.2.13/data.yml b/apps/ani-rss/2.2.14/data.yml similarity index 100% rename from apps/ani-rss/2.2.13/data.yml rename to apps/ani-rss/2.2.14/data.yml diff --git a/apps/ani-rss/2.2.13/docker-compose.yml b/apps/ani-rss/2.2.14/docker-compose.yml similarity index 100% rename from apps/ani-rss/2.2.13/docker-compose.yml rename to apps/ani-rss/2.2.14/docker-compose.yml diff --git a/apps/ani-rss/2.2.13/envs/default.env b/apps/ani-rss/2.2.14/envs/default.env similarity index 100% rename from apps/ani-rss/2.2.13/envs/default.env rename to apps/ani-rss/2.2.14/envs/default.env diff --git a/apps/ani-rss/2.2.13/envs/global.env b/apps/ani-rss/2.2.14/envs/global.env similarity index 100% rename from apps/ani-rss/2.2.13/envs/global.env rename to apps/ani-rss/2.2.14/envs/global.env diff --git a/apps/ani-rss/2.2.13/scripts/init.sh b/apps/ani-rss/2.2.14/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.2.13/scripts/init.sh rename to apps/ani-rss/2.2.14/scripts/init.sh diff --git a/apps/ani-rss/2.2.13/scripts/uninstall.sh b/apps/ani-rss/2.2.14/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.2.13/scripts/uninstall.sh rename to apps/ani-rss/2.2.14/scripts/uninstall.sh diff --git a/apps/ani-rss/2.2.13/scripts/upgrade.sh b/apps/ani-rss/2.2.14/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.2.13/scripts/upgrade.sh rename to apps/ani-rss/2.2.14/scripts/upgrade.sh From 130b4af5a5fe2b0c6a0b4e28dbe3e5e7139675e4 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 15:20:52 +0000 Subject: [PATCH 057/262] Processed apps directory via GitHub Actions --- appstore/ani-rss/{2.2.13 => 2.2.14}/.env | 0 appstore/ani-rss/{2.2.13 => 2.2.14}/data.yml | 0 appstore/ani-rss/{2.2.13 => 2.2.14}/docker-compose.yml | 2 +- appstore/ani-rss/{2.2.13 => 2.2.14}/envs/default.env | 0 appstore/ani-rss/{2.2.13 => 2.2.14}/envs/global.env | 0 appstore/ani-rss/{2.2.13 => 2.2.14}/scripts/init.sh | 0 appstore/ani-rss/{2.2.13 => 2.2.14}/scripts/uninstall.sh | 0 appstore/ani-rss/{2.2.13 => 2.2.14}/scripts/upgrade.sh | 0 appstore/n8n/{1.115.1 => 1.115.2}/.env | 0 appstore/n8n/{1.115.1 => 1.115.2}/data.yml | 0 appstore/n8n/{1.115.1 => 1.115.2}/docker-compose.yml | 2 +- appstore/n8n/{1.115.1 => 1.115.2}/envs/default.env | 0 appstore/n8n/{1.115.1 => 1.115.2}/envs/global.env | 0 appstore/n8n/{1.115.1 => 1.115.2}/scripts/init.sh | 0 appstore/n8n/{1.115.1 => 1.115.2}/scripts/uninstall.sh | 0 appstore/n8n/{1.115.1 => 1.115.2}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 2 +- dockge/n8n/docker-compose.yml | 2 +- 18 files changed, 4 insertions(+), 4 deletions(-) rename appstore/ani-rss/{2.2.13 => 2.2.14}/.env (100%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/data.yml (100%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/docker-compose.yml (95%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/envs/default.env (100%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/envs/global.env (100%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/scripts/init.sh (100%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.2.13 => 2.2.14}/scripts/upgrade.sh (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/.env (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/data.yml (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/docker-compose.yml (94%) rename appstore/n8n/{1.115.1 => 1.115.2}/envs/default.env (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/envs/global.env (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/scripts/init.sh (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/scripts/uninstall.sh (100%) rename appstore/n8n/{1.115.1 => 1.115.2}/scripts/upgrade.sh (100%) diff --git a/appstore/ani-rss/2.2.13/.env b/appstore/ani-rss/2.2.14/.env similarity index 100% rename from appstore/ani-rss/2.2.13/.env rename to appstore/ani-rss/2.2.14/.env diff --git a/appstore/ani-rss/2.2.13/data.yml b/appstore/ani-rss/2.2.14/data.yml similarity index 100% rename from appstore/ani-rss/2.2.13/data.yml rename to appstore/ani-rss/2.2.14/data.yml diff --git a/appstore/ani-rss/2.2.13/docker-compose.yml b/appstore/ani-rss/2.2.14/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.2.13/docker-compose.yml rename to appstore/ani-rss/2.2.14/docker-compose.yml index f36733072..1b5747174 100644 --- a/appstore/ani-rss/2.2.13/docker-compose.yml +++ b/appstore/ani-rss/2.2.14/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.13 + image: wushuo894/ani-rss:v2.2.14 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/2.2.13/envs/default.env b/appstore/ani-rss/2.2.14/envs/default.env similarity index 100% rename from appstore/ani-rss/2.2.13/envs/default.env rename to appstore/ani-rss/2.2.14/envs/default.env diff --git a/appstore/ani-rss/2.2.13/envs/global.env b/appstore/ani-rss/2.2.14/envs/global.env similarity index 100% rename from appstore/ani-rss/2.2.13/envs/global.env rename to appstore/ani-rss/2.2.14/envs/global.env diff --git a/appstore/ani-rss/2.2.13/scripts/init.sh b/appstore/ani-rss/2.2.14/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.2.13/scripts/init.sh rename to appstore/ani-rss/2.2.14/scripts/init.sh diff --git a/appstore/ani-rss/2.2.13/scripts/uninstall.sh b/appstore/ani-rss/2.2.14/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.2.13/scripts/uninstall.sh rename to appstore/ani-rss/2.2.14/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.2.13/scripts/upgrade.sh b/appstore/ani-rss/2.2.14/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.2.13/scripts/upgrade.sh rename to appstore/ani-rss/2.2.14/scripts/upgrade.sh diff --git a/appstore/n8n/1.115.1/.env b/appstore/n8n/1.115.2/.env similarity index 100% rename from appstore/n8n/1.115.1/.env rename to appstore/n8n/1.115.2/.env diff --git a/appstore/n8n/1.115.1/data.yml b/appstore/n8n/1.115.2/data.yml similarity index 100% rename from appstore/n8n/1.115.1/data.yml rename to appstore/n8n/1.115.2/data.yml diff --git a/appstore/n8n/1.115.1/docker-compose.yml b/appstore/n8n/1.115.2/docker-compose.yml similarity index 94% rename from appstore/n8n/1.115.1/docker-compose.yml rename to appstore/n8n/1.115.2/docker-compose.yml index 497287881..8ba4d8b58 100644 --- a/appstore/n8n/1.115.1/docker-compose.yml +++ b/appstore/n8n/1.115.2/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.115.1 + image: n8nio/n8n:1.115.2 labels: createdBy: Apps networks: diff --git a/appstore/n8n/1.115.1/envs/default.env b/appstore/n8n/1.115.2/envs/default.env similarity index 100% rename from appstore/n8n/1.115.1/envs/default.env rename to appstore/n8n/1.115.2/envs/default.env diff --git a/appstore/n8n/1.115.1/envs/global.env b/appstore/n8n/1.115.2/envs/global.env similarity index 100% rename from appstore/n8n/1.115.1/envs/global.env rename to appstore/n8n/1.115.2/envs/global.env diff --git a/appstore/n8n/1.115.1/scripts/init.sh b/appstore/n8n/1.115.2/scripts/init.sh similarity index 100% rename from appstore/n8n/1.115.1/scripts/init.sh rename to appstore/n8n/1.115.2/scripts/init.sh diff --git a/appstore/n8n/1.115.1/scripts/uninstall.sh b/appstore/n8n/1.115.2/scripts/uninstall.sh similarity index 100% rename from appstore/n8n/1.115.1/scripts/uninstall.sh rename to appstore/n8n/1.115.2/scripts/uninstall.sh diff --git a/appstore/n8n/1.115.1/scripts/upgrade.sh b/appstore/n8n/1.115.2/scripts/upgrade.sh similarity index 100% rename from appstore/n8n/1.115.1/scripts/upgrade.sh rename to appstore/n8n/1.115.2/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index f36733072..1b5747174 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.13 + image: wushuo894/ani-rss:v2.2.14 labels: createdBy: Apps networks: diff --git a/dockge/n8n/docker-compose.yml b/dockge/n8n/docker-compose.yml index 497287881..8ba4d8b58 100644 --- a/dockge/n8n/docker-compose.yml +++ b/dockge/n8n/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.115.1 + image: n8nio/n8n:1.115.2 labels: createdBy: Apps networks: From c736a9b01d269c20364d118be9261b4c6926f25d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:25:11 +0000 Subject: [PATCH 058/262] Update ghcr.io/nodepassproject/nodepassdash Docker tag to v3.1.3 --- apps/nodepassdash/3.1.2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nodepassdash/3.1.2/docker-compose.yml b/apps/nodepassdash/3.1.2/docker-compose.yml index 8d780e90f..1cf456738 100644 --- a/apps/nodepassdash/3.1.2/docker-compose.yml +++ b/apps/nodepassdash/3.1.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nodepassdash: - image: ghcr.io/nodepassproject/nodepassdash:3.1.2 + image: ghcr.io/nodepassproject/nodepassdash:3.1.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From a31f7988436a160da06d67809e761b7c1371c2f3 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 15:25:26 +0000 Subject: [PATCH 059/262] Update app version [skip ci] --- apps/nodepassdash/{3.1.2 => 3.1.3}/data.yml | 0 apps/nodepassdash/{3.1.2 => 3.1.3}/docker-compose.yml | 0 apps/nodepassdash/{3.1.2 => 3.1.3}/envs/default.env | 0 apps/nodepassdash/{3.1.2 => 3.1.3}/envs/global.env | 0 apps/nodepassdash/{3.1.2 => 3.1.3}/scripts/init.sh | 0 apps/nodepassdash/{3.1.2 => 3.1.3}/scripts/uninstall.sh | 0 apps/nodepassdash/{3.1.2 => 3.1.3}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/nodepassdash/{3.1.2 => 3.1.3}/data.yml (100%) rename apps/nodepassdash/{3.1.2 => 3.1.3}/docker-compose.yml (100%) rename apps/nodepassdash/{3.1.2 => 3.1.3}/envs/default.env (100%) rename apps/nodepassdash/{3.1.2 => 3.1.3}/envs/global.env (100%) rename apps/nodepassdash/{3.1.2 => 3.1.3}/scripts/init.sh (100%) rename apps/nodepassdash/{3.1.2 => 3.1.3}/scripts/uninstall.sh (100%) rename apps/nodepassdash/{3.1.2 => 3.1.3}/scripts/upgrade.sh (100%) diff --git a/apps/nodepassdash/3.1.2/data.yml b/apps/nodepassdash/3.1.3/data.yml similarity index 100% rename from apps/nodepassdash/3.1.2/data.yml rename to apps/nodepassdash/3.1.3/data.yml diff --git a/apps/nodepassdash/3.1.2/docker-compose.yml b/apps/nodepassdash/3.1.3/docker-compose.yml similarity index 100% rename from apps/nodepassdash/3.1.2/docker-compose.yml rename to apps/nodepassdash/3.1.3/docker-compose.yml diff --git a/apps/nodepassdash/3.1.2/envs/default.env b/apps/nodepassdash/3.1.3/envs/default.env similarity index 100% rename from apps/nodepassdash/3.1.2/envs/default.env rename to apps/nodepassdash/3.1.3/envs/default.env diff --git a/apps/nodepassdash/3.1.2/envs/global.env b/apps/nodepassdash/3.1.3/envs/global.env similarity index 100% rename from apps/nodepassdash/3.1.2/envs/global.env rename to apps/nodepassdash/3.1.3/envs/global.env diff --git a/apps/nodepassdash/3.1.2/scripts/init.sh b/apps/nodepassdash/3.1.3/scripts/init.sh similarity index 100% rename from apps/nodepassdash/3.1.2/scripts/init.sh rename to apps/nodepassdash/3.1.3/scripts/init.sh diff --git a/apps/nodepassdash/3.1.2/scripts/uninstall.sh b/apps/nodepassdash/3.1.3/scripts/uninstall.sh similarity index 100% rename from apps/nodepassdash/3.1.2/scripts/uninstall.sh rename to apps/nodepassdash/3.1.3/scripts/uninstall.sh diff --git a/apps/nodepassdash/3.1.2/scripts/upgrade.sh b/apps/nodepassdash/3.1.3/scripts/upgrade.sh similarity index 100% rename from apps/nodepassdash/3.1.2/scripts/upgrade.sh rename to apps/nodepassdash/3.1.3/scripts/upgrade.sh From a6784e24423e42d554358ecfa60068beec2503f1 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 18:30:10 +0000 Subject: [PATCH 060/262] Processed apps directory via GitHub Actions --- appstore/nodepassdash/{3.1.2 => 3.1.3}/.env | 0 appstore/nodepassdash/{3.1.2 => 3.1.3}/data.yml | 0 appstore/nodepassdash/{3.1.2 => 3.1.3}/docker-compose.yml | 2 +- appstore/nodepassdash/{3.1.2 => 3.1.3}/envs/default.env | 0 appstore/nodepassdash/{3.1.2 => 3.1.3}/envs/global.env | 0 appstore/nodepassdash/{3.1.2 => 3.1.3}/scripts/init.sh | 0 appstore/nodepassdash/{3.1.2 => 3.1.3}/scripts/uninstall.sh | 0 appstore/nodepassdash/{3.1.2 => 3.1.3}/scripts/upgrade.sh | 0 dockge/nodepassdash/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/.env (100%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/data.yml (100%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/docker-compose.yml (90%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/envs/default.env (100%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/envs/global.env (100%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/scripts/init.sh (100%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/scripts/uninstall.sh (100%) rename appstore/nodepassdash/{3.1.2 => 3.1.3}/scripts/upgrade.sh (100%) diff --git a/appstore/nodepassdash/3.1.2/.env b/appstore/nodepassdash/3.1.3/.env similarity index 100% rename from appstore/nodepassdash/3.1.2/.env rename to appstore/nodepassdash/3.1.3/.env diff --git a/appstore/nodepassdash/3.1.2/data.yml b/appstore/nodepassdash/3.1.3/data.yml similarity index 100% rename from appstore/nodepassdash/3.1.2/data.yml rename to appstore/nodepassdash/3.1.3/data.yml diff --git a/appstore/nodepassdash/3.1.2/docker-compose.yml b/appstore/nodepassdash/3.1.3/docker-compose.yml similarity index 90% rename from appstore/nodepassdash/3.1.2/docker-compose.yml rename to appstore/nodepassdash/3.1.3/docker-compose.yml index 62d78c70f..5ee7fe1ee 100644 --- a/appstore/nodepassdash/3.1.2/docker-compose.yml +++ b/appstore/nodepassdash/3.1.3/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:3.1.2 + image: ghcr.io/nodepassproject/nodepassdash:3.1.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/nodepassdash/3.1.2/envs/default.env b/appstore/nodepassdash/3.1.3/envs/default.env similarity index 100% rename from appstore/nodepassdash/3.1.2/envs/default.env rename to appstore/nodepassdash/3.1.3/envs/default.env diff --git a/appstore/nodepassdash/3.1.2/envs/global.env b/appstore/nodepassdash/3.1.3/envs/global.env similarity index 100% rename from appstore/nodepassdash/3.1.2/envs/global.env rename to appstore/nodepassdash/3.1.3/envs/global.env diff --git a/appstore/nodepassdash/3.1.2/scripts/init.sh b/appstore/nodepassdash/3.1.3/scripts/init.sh similarity index 100% rename from appstore/nodepassdash/3.1.2/scripts/init.sh rename to appstore/nodepassdash/3.1.3/scripts/init.sh diff --git a/appstore/nodepassdash/3.1.2/scripts/uninstall.sh b/appstore/nodepassdash/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/nodepassdash/3.1.2/scripts/uninstall.sh rename to appstore/nodepassdash/3.1.3/scripts/uninstall.sh diff --git a/appstore/nodepassdash/3.1.2/scripts/upgrade.sh b/appstore/nodepassdash/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/nodepassdash/3.1.2/scripts/upgrade.sh rename to appstore/nodepassdash/3.1.3/scripts/upgrade.sh diff --git a/dockge/nodepassdash/docker-compose.yml b/dockge/nodepassdash/docker-compose.yml index 62d78c70f..5ee7fe1ee 100644 --- a/dockge/nodepassdash/docker-compose.yml +++ b/dockge/nodepassdash/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:3.1.2 + image: ghcr.io/nodepassproject/nodepassdash:3.1.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} From c4b5bb915525d4863c60ea4ded295f11f3916bbd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 19:15:31 +0000 Subject: [PATCH 061/262] Update johannesjo/super-productivity Docker tag to v15.2.0 --- apps/super-productivity/15.1.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/super-productivity/15.1.1/docker-compose.yml b/apps/super-productivity/15.1.1/docker-compose.yml index 3de80271f..df3395e67 100644 --- a/apps/super-productivity/15.1.1/docker-compose.yml +++ b/apps/super-productivity/15.1.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: super-productivity: - image: johannesjo/super-productivity:v15.1.1 + image: johannesjo/super-productivity:v15.2.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From ae1aece0f8f7fcc85205ec8e9bba6b979f607d17 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 19:15:42 +0000 Subject: [PATCH 062/262] Update app version [skip ci] --- apps/super-productivity/{15.1.1 => 15.2.0}/conf/webdav.yaml | 0 apps/super-productivity/{15.1.1 => 15.2.0}/data.yml | 0 apps/super-productivity/{15.1.1 => 15.2.0}/docker-compose.yml | 0 apps/super-productivity/{15.1.1 => 15.2.0}/envs/default.env | 0 apps/super-productivity/{15.1.1 => 15.2.0}/envs/global.env | 0 apps/super-productivity/{15.1.1 => 15.2.0}/scripts/init.sh | 0 apps/super-productivity/{15.1.1 => 15.2.0}/scripts/uninstall.sh | 0 apps/super-productivity/{15.1.1 => 15.2.0}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/super-productivity/{15.1.1 => 15.2.0}/conf/webdav.yaml (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/data.yml (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/docker-compose.yml (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/envs/default.env (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/envs/global.env (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/scripts/init.sh (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/scripts/uninstall.sh (100%) rename apps/super-productivity/{15.1.1 => 15.2.0}/scripts/upgrade.sh (100%) diff --git a/apps/super-productivity/15.1.1/conf/webdav.yaml b/apps/super-productivity/15.2.0/conf/webdav.yaml similarity index 100% rename from apps/super-productivity/15.1.1/conf/webdav.yaml rename to apps/super-productivity/15.2.0/conf/webdav.yaml diff --git a/apps/super-productivity/15.1.1/data.yml b/apps/super-productivity/15.2.0/data.yml similarity index 100% rename from apps/super-productivity/15.1.1/data.yml rename to apps/super-productivity/15.2.0/data.yml diff --git a/apps/super-productivity/15.1.1/docker-compose.yml b/apps/super-productivity/15.2.0/docker-compose.yml similarity index 100% rename from apps/super-productivity/15.1.1/docker-compose.yml rename to apps/super-productivity/15.2.0/docker-compose.yml diff --git a/apps/super-productivity/15.1.1/envs/default.env b/apps/super-productivity/15.2.0/envs/default.env similarity index 100% rename from apps/super-productivity/15.1.1/envs/default.env rename to apps/super-productivity/15.2.0/envs/default.env diff --git a/apps/super-productivity/15.1.1/envs/global.env b/apps/super-productivity/15.2.0/envs/global.env similarity index 100% rename from apps/super-productivity/15.1.1/envs/global.env rename to apps/super-productivity/15.2.0/envs/global.env diff --git a/apps/super-productivity/15.1.1/scripts/init.sh b/apps/super-productivity/15.2.0/scripts/init.sh similarity index 100% rename from apps/super-productivity/15.1.1/scripts/init.sh rename to apps/super-productivity/15.2.0/scripts/init.sh diff --git a/apps/super-productivity/15.1.1/scripts/uninstall.sh b/apps/super-productivity/15.2.0/scripts/uninstall.sh similarity index 100% rename from apps/super-productivity/15.1.1/scripts/uninstall.sh rename to apps/super-productivity/15.2.0/scripts/uninstall.sh diff --git a/apps/super-productivity/15.1.1/scripts/upgrade.sh b/apps/super-productivity/15.2.0/scripts/upgrade.sh similarity index 100% rename from apps/super-productivity/15.1.1/scripts/upgrade.sh rename to apps/super-productivity/15.2.0/scripts/upgrade.sh From d5cc9fb95e7126146785e4d7eaa80985243cf8e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 20:14:51 +0000 Subject: [PATCH 063/262] Update ghcr.io/homarr-labs/homarr Docker tag to v1.41.0 --- apps/homarr/1.40.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/homarr/1.40.0/docker-compose.yml b/apps/homarr/1.40.0/docker-compose.yml index 2db16a3cf..9ae0f6f09 100644 --- a/apps/homarr/1.40.0/docker-compose.yml +++ b/apps/homarr/1.40.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: homarr: - image: ghcr.io/homarr-labs/homarr:v1.40.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 2668129fa40e89e0d0a9c994bc9bbda1be882624 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 20:15:01 +0000 Subject: [PATCH 064/262] Update app version [skip ci] --- apps/homarr/{1.40.0 => 1.41.0}/data.yml | 0 apps/homarr/{1.40.0 => 1.41.0}/docker-compose.yml | 0 apps/homarr/{1.40.0 => 1.41.0}/envs/default.env | 0 apps/homarr/{1.40.0 => 1.41.0}/envs/global.env | 0 apps/homarr/{1.40.0 => 1.41.0}/scripts/init.sh | 0 apps/homarr/{1.40.0 => 1.41.0}/scripts/uninstall.sh | 0 apps/homarr/{1.40.0 => 1.41.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/homarr/{1.40.0 => 1.41.0}/data.yml (100%) rename apps/homarr/{1.40.0 => 1.41.0}/docker-compose.yml (100%) rename apps/homarr/{1.40.0 => 1.41.0}/envs/default.env (100%) rename apps/homarr/{1.40.0 => 1.41.0}/envs/global.env (100%) rename apps/homarr/{1.40.0 => 1.41.0}/scripts/init.sh (100%) rename apps/homarr/{1.40.0 => 1.41.0}/scripts/uninstall.sh (100%) rename apps/homarr/{1.40.0 => 1.41.0}/scripts/upgrade.sh (100%) diff --git a/apps/homarr/1.40.0/data.yml b/apps/homarr/1.41.0/data.yml similarity index 100% rename from apps/homarr/1.40.0/data.yml rename to apps/homarr/1.41.0/data.yml diff --git a/apps/homarr/1.40.0/docker-compose.yml b/apps/homarr/1.41.0/docker-compose.yml similarity index 100% rename from apps/homarr/1.40.0/docker-compose.yml rename to apps/homarr/1.41.0/docker-compose.yml diff --git a/apps/homarr/1.40.0/envs/default.env b/apps/homarr/1.41.0/envs/default.env similarity index 100% rename from apps/homarr/1.40.0/envs/default.env rename to apps/homarr/1.41.0/envs/default.env diff --git a/apps/homarr/1.40.0/envs/global.env b/apps/homarr/1.41.0/envs/global.env similarity index 100% rename from apps/homarr/1.40.0/envs/global.env rename to apps/homarr/1.41.0/envs/global.env diff --git a/apps/homarr/1.40.0/scripts/init.sh b/apps/homarr/1.41.0/scripts/init.sh similarity index 100% rename from apps/homarr/1.40.0/scripts/init.sh rename to apps/homarr/1.41.0/scripts/init.sh diff --git a/apps/homarr/1.40.0/scripts/uninstall.sh b/apps/homarr/1.41.0/scripts/uninstall.sh similarity index 100% rename from apps/homarr/1.40.0/scripts/uninstall.sh rename to apps/homarr/1.41.0/scripts/uninstall.sh diff --git a/apps/homarr/1.40.0/scripts/upgrade.sh b/apps/homarr/1.41.0/scripts/upgrade.sh similarity index 100% rename from apps/homarr/1.40.0/scripts/upgrade.sh rename to apps/homarr/1.41.0/scripts/upgrade.sh From 1a2dcf277aa7446bed75bbe63a1aae3c4511b5b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 21:14:03 +0000 Subject: [PATCH 065/262] Update anirdev/slink Docker tag to v1.7.1 --- apps/slink/1.7.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/slink/1.7.0/docker-compose.yml b/apps/slink/1.7.0/docker-compose.yml index 250464475..5cddd9677 100644 --- a/apps/slink/1.7.0/docker-compose.yml +++ b/apps/slink/1.7.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: slink: - image: anirdev/slink:v1.7.0 + image: anirdev/slink:v1.7.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 80a413ccd9dd2151d46e6fdd6449d2e8ce0f86cc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 21:14:08 +0000 Subject: [PATCH 066/262] Update ollama/ollama Docker tag to v0.12.5 --- apps/ollama/0.12.4/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ollama/0.12.4/docker-compose.yml b/apps/ollama/0.12.4/docker-compose.yml index 2ed84b022..fd2eb9acd 100644 --- a/apps/ollama/0.12.4/docker-compose.yml +++ b/apps/ollama/0.12.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ollama: - image: ollama/ollama:0.12.4 + image: ollama/ollama:0.12.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 968cac66d85920fd500f965bb001765d637c60d1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 21:14:19 +0000 Subject: [PATCH 067/262] Update app version [skip ci] --- apps/ollama/{0.12.4 => 0.12.5}/data.yml | 0 apps/ollama/{0.12.4 => 0.12.5}/docker-compose.yml | 0 apps/ollama/{0.12.4 => 0.12.5}/envs/default.env | 0 apps/ollama/{0.12.4 => 0.12.5}/envs/global.env | 0 apps/ollama/{0.12.4 => 0.12.5}/scripts/init.sh | 0 apps/ollama/{0.12.4 => 0.12.5}/scripts/uninstall.sh | 0 apps/ollama/{0.12.4 => 0.12.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ollama/{0.12.4 => 0.12.5}/data.yml (100%) rename apps/ollama/{0.12.4 => 0.12.5}/docker-compose.yml (100%) rename apps/ollama/{0.12.4 => 0.12.5}/envs/default.env (100%) rename apps/ollama/{0.12.4 => 0.12.5}/envs/global.env (100%) rename apps/ollama/{0.12.4 => 0.12.5}/scripts/init.sh (100%) rename apps/ollama/{0.12.4 => 0.12.5}/scripts/uninstall.sh (100%) rename apps/ollama/{0.12.4 => 0.12.5}/scripts/upgrade.sh (100%) diff --git a/apps/ollama/0.12.4/data.yml b/apps/ollama/0.12.5/data.yml similarity index 100% rename from apps/ollama/0.12.4/data.yml rename to apps/ollama/0.12.5/data.yml diff --git a/apps/ollama/0.12.4/docker-compose.yml b/apps/ollama/0.12.5/docker-compose.yml similarity index 100% rename from apps/ollama/0.12.4/docker-compose.yml rename to apps/ollama/0.12.5/docker-compose.yml diff --git a/apps/ollama/0.12.4/envs/default.env b/apps/ollama/0.12.5/envs/default.env similarity index 100% rename from apps/ollama/0.12.4/envs/default.env rename to apps/ollama/0.12.5/envs/default.env diff --git a/apps/ollama/0.12.4/envs/global.env b/apps/ollama/0.12.5/envs/global.env similarity index 100% rename from apps/ollama/0.12.4/envs/global.env rename to apps/ollama/0.12.5/envs/global.env diff --git a/apps/ollama/0.12.4/scripts/init.sh b/apps/ollama/0.12.5/scripts/init.sh similarity index 100% rename from apps/ollama/0.12.4/scripts/init.sh rename to apps/ollama/0.12.5/scripts/init.sh diff --git a/apps/ollama/0.12.4/scripts/uninstall.sh b/apps/ollama/0.12.5/scripts/uninstall.sh similarity index 100% rename from apps/ollama/0.12.4/scripts/uninstall.sh rename to apps/ollama/0.12.5/scripts/uninstall.sh diff --git a/apps/ollama/0.12.4/scripts/upgrade.sh b/apps/ollama/0.12.5/scripts/upgrade.sh similarity index 100% rename from apps/ollama/0.12.4/scripts/upgrade.sh rename to apps/ollama/0.12.5/scripts/upgrade.sh From a80e662112fa1926ad1650c541d48fff459d86d9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 10 Oct 2025 21:14:19 +0000 Subject: [PATCH 068/262] Update app version [skip ci] --- apps/slink/{1.7.0 => 1.7.1}/data.yml | 0 apps/slink/{1.7.0 => 1.7.1}/docker-compose.yml | 0 apps/slink/{1.7.0 => 1.7.1}/envs/default.env | 0 apps/slink/{1.7.0 => 1.7.1}/envs/global.env | 0 apps/slink/{1.7.0 => 1.7.1}/scripts/init.sh | 0 apps/slink/{1.7.0 => 1.7.1}/scripts/uninstall.sh | 0 apps/slink/{1.7.0 => 1.7.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/slink/{1.7.0 => 1.7.1}/data.yml (100%) rename apps/slink/{1.7.0 => 1.7.1}/docker-compose.yml (100%) rename apps/slink/{1.7.0 => 1.7.1}/envs/default.env (100%) rename apps/slink/{1.7.0 => 1.7.1}/envs/global.env (100%) rename apps/slink/{1.7.0 => 1.7.1}/scripts/init.sh (100%) rename apps/slink/{1.7.0 => 1.7.1}/scripts/uninstall.sh (100%) rename apps/slink/{1.7.0 => 1.7.1}/scripts/upgrade.sh (100%) diff --git a/apps/slink/1.7.0/data.yml b/apps/slink/1.7.1/data.yml similarity index 100% rename from apps/slink/1.7.0/data.yml rename to apps/slink/1.7.1/data.yml diff --git a/apps/slink/1.7.0/docker-compose.yml b/apps/slink/1.7.1/docker-compose.yml similarity index 100% rename from apps/slink/1.7.0/docker-compose.yml rename to apps/slink/1.7.1/docker-compose.yml diff --git a/apps/slink/1.7.0/envs/default.env b/apps/slink/1.7.1/envs/default.env similarity index 100% rename from apps/slink/1.7.0/envs/default.env rename to apps/slink/1.7.1/envs/default.env diff --git a/apps/slink/1.7.0/envs/global.env b/apps/slink/1.7.1/envs/global.env similarity index 100% rename from apps/slink/1.7.0/envs/global.env rename to apps/slink/1.7.1/envs/global.env diff --git a/apps/slink/1.7.0/scripts/init.sh b/apps/slink/1.7.1/scripts/init.sh similarity index 100% rename from apps/slink/1.7.0/scripts/init.sh rename to apps/slink/1.7.1/scripts/init.sh diff --git a/apps/slink/1.7.0/scripts/uninstall.sh b/apps/slink/1.7.1/scripts/uninstall.sh similarity index 100% rename from apps/slink/1.7.0/scripts/uninstall.sh rename to apps/slink/1.7.1/scripts/uninstall.sh diff --git a/apps/slink/1.7.0/scripts/upgrade.sh b/apps/slink/1.7.1/scripts/upgrade.sh similarity index 100% rename from apps/slink/1.7.0/scripts/upgrade.sh rename to apps/slink/1.7.1/scripts/upgrade.sh From 368c3c08f6bd0379b113a951d12c3eba6406d57c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 10 Oct 2025 21:17:32 +0000 Subject: [PATCH 069/262] Processed apps directory via GitHub Actions --- appstore/homarr/{1.40.0 => 1.41.0}/.env | 0 appstore/homarr/{1.40.0 => 1.41.0}/data.yml | 0 appstore/homarr/{1.40.0 => 1.41.0}/docker-compose.yml | 2 +- appstore/homarr/{1.40.0 => 1.41.0}/envs/default.env | 0 appstore/homarr/{1.40.0 => 1.41.0}/envs/global.env | 0 appstore/homarr/{1.40.0 => 1.41.0}/scripts/init.sh | 0 appstore/homarr/{1.40.0 => 1.41.0}/scripts/uninstall.sh | 0 appstore/homarr/{1.40.0 => 1.41.0}/scripts/upgrade.sh | 0 appstore/ollama/{0.12.4 => 0.12.5}/.env | 0 appstore/ollama/{0.12.4 => 0.12.5}/data.yml | 0 appstore/ollama/{0.12.4 => 0.12.5}/docker-compose.yml | 2 +- appstore/ollama/{0.12.4 => 0.12.5}/envs/default.env | 0 appstore/ollama/{0.12.4 => 0.12.5}/envs/global.env | 0 appstore/ollama/{0.12.4 => 0.12.5}/scripts/init.sh | 0 appstore/ollama/{0.12.4 => 0.12.5}/scripts/uninstall.sh | 0 appstore/ollama/{0.12.4 => 0.12.5}/scripts/upgrade.sh | 0 appstore/slink/{1.7.0 => 1.7.1}/.env | 0 appstore/slink/{1.7.0 => 1.7.1}/data.yml | 0 appstore/slink/{1.7.0 => 1.7.1}/docker-compose.yml | 2 +- appstore/slink/{1.7.0 => 1.7.1}/envs/default.env | 0 appstore/slink/{1.7.0 => 1.7.1}/envs/global.env | 0 appstore/slink/{1.7.0 => 1.7.1}/scripts/init.sh | 0 appstore/slink/{1.7.0 => 1.7.1}/scripts/uninstall.sh | 0 appstore/slink/{1.7.0 => 1.7.1}/scripts/upgrade.sh | 0 appstore/super-productivity/{15.1.1 => 15.2.0}/.env | 0 appstore/super-productivity/{15.1.1 => 15.2.0}/conf/webdav.yaml | 0 appstore/super-productivity/{15.1.1 => 15.2.0}/data.yml | 0 .../super-productivity/{15.1.1 => 15.2.0}/docker-compose.yml | 2 +- appstore/super-productivity/{15.1.1 => 15.2.0}/envs/default.env | 0 appstore/super-productivity/{15.1.1 => 15.2.0}/envs/global.env | 0 appstore/super-productivity/{15.1.1 => 15.2.0}/scripts/init.sh | 0 .../super-productivity/{15.1.1 => 15.2.0}/scripts/uninstall.sh | 0 .../super-productivity/{15.1.1 => 15.2.0}/scripts/upgrade.sh | 0 dockge/homarr/.env | 2 +- dockge/homarr/docker-compose.yml | 2 +- dockge/{homarr_0_16_0 => homarr_1_41_0}/.env | 2 +- dockge/{homarr_0_16_0 => homarr_1_41_0}/docker-compose.yml | 2 +- dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/default.env | 0 dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/global.env | 0 dockge/ollama/docker-compose.yml | 2 +- dockge/slink/docker-compose.yml | 2 +- dockge/super-productivity/docker-compose.yml | 2 +- 42 files changed, 11 insertions(+), 11 deletions(-) rename appstore/homarr/{1.40.0 => 1.41.0}/.env (100%) rename appstore/homarr/{1.40.0 => 1.41.0}/data.yml (100%) rename appstore/homarr/{1.40.0 => 1.41.0}/docker-compose.yml (89%) rename appstore/homarr/{1.40.0 => 1.41.0}/envs/default.env (100%) rename appstore/homarr/{1.40.0 => 1.41.0}/envs/global.env (100%) rename appstore/homarr/{1.40.0 => 1.41.0}/scripts/init.sh (100%) rename appstore/homarr/{1.40.0 => 1.41.0}/scripts/uninstall.sh (100%) rename appstore/homarr/{1.40.0 => 1.41.0}/scripts/upgrade.sh (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/.env (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/data.yml (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/docker-compose.yml (95%) rename appstore/ollama/{0.12.4 => 0.12.5}/envs/default.env (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/envs/global.env (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/scripts/init.sh (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/scripts/uninstall.sh (100%) rename appstore/ollama/{0.12.4 => 0.12.5}/scripts/upgrade.sh (100%) rename appstore/slink/{1.7.0 => 1.7.1}/.env (100%) rename appstore/slink/{1.7.0 => 1.7.1}/data.yml (100%) rename appstore/slink/{1.7.0 => 1.7.1}/docker-compose.yml (94%) rename appstore/slink/{1.7.0 => 1.7.1}/envs/default.env (100%) rename appstore/slink/{1.7.0 => 1.7.1}/envs/global.env (100%) rename appstore/slink/{1.7.0 => 1.7.1}/scripts/init.sh (100%) rename appstore/slink/{1.7.0 => 1.7.1}/scripts/uninstall.sh (100%) rename appstore/slink/{1.7.0 => 1.7.1}/scripts/upgrade.sh (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/.env (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/conf/webdav.yaml (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/data.yml (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/docker-compose.yml (93%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/envs/default.env (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/envs/global.env (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/scripts/init.sh (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/scripts/uninstall.sh (100%) rename appstore/super-productivity/{15.1.1 => 15.2.0}/scripts/upgrade.sh (100%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/.env (67%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/docker-compose.yml (89%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/default.env (100%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/global.env (100%) diff --git a/appstore/homarr/1.40.0/.env b/appstore/homarr/1.41.0/.env similarity index 100% rename from appstore/homarr/1.40.0/.env rename to appstore/homarr/1.41.0/.env diff --git a/appstore/homarr/1.40.0/data.yml b/appstore/homarr/1.41.0/data.yml similarity index 100% rename from appstore/homarr/1.40.0/data.yml rename to appstore/homarr/1.41.0/data.yml diff --git a/appstore/homarr/1.40.0/docker-compose.yml b/appstore/homarr/1.41.0/docker-compose.yml similarity index 89% rename from appstore/homarr/1.40.0/docker-compose.yml rename to appstore/homarr/1.41.0/docker-compose.yml index b8eb2eac4..06b42b32c 100644 --- a/appstore/homarr/1.40.0/docker-compose.yml +++ b/appstore/homarr/1.41.0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.40.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/homarr/1.40.0/envs/default.env b/appstore/homarr/1.41.0/envs/default.env similarity index 100% rename from appstore/homarr/1.40.0/envs/default.env rename to appstore/homarr/1.41.0/envs/default.env diff --git a/appstore/homarr/1.40.0/envs/global.env b/appstore/homarr/1.41.0/envs/global.env similarity index 100% rename from appstore/homarr/1.40.0/envs/global.env rename to appstore/homarr/1.41.0/envs/global.env diff --git a/appstore/homarr/1.40.0/scripts/init.sh b/appstore/homarr/1.41.0/scripts/init.sh similarity index 100% rename from appstore/homarr/1.40.0/scripts/init.sh rename to appstore/homarr/1.41.0/scripts/init.sh diff --git a/appstore/homarr/1.40.0/scripts/uninstall.sh b/appstore/homarr/1.41.0/scripts/uninstall.sh similarity index 100% rename from appstore/homarr/1.40.0/scripts/uninstall.sh rename to appstore/homarr/1.41.0/scripts/uninstall.sh diff --git a/appstore/homarr/1.40.0/scripts/upgrade.sh b/appstore/homarr/1.41.0/scripts/upgrade.sh similarity index 100% rename from appstore/homarr/1.40.0/scripts/upgrade.sh rename to appstore/homarr/1.41.0/scripts/upgrade.sh diff --git a/appstore/ollama/0.12.4/.env b/appstore/ollama/0.12.5/.env similarity index 100% rename from appstore/ollama/0.12.4/.env rename to appstore/ollama/0.12.5/.env diff --git a/appstore/ollama/0.12.4/data.yml b/appstore/ollama/0.12.5/data.yml similarity index 100% rename from appstore/ollama/0.12.4/data.yml rename to appstore/ollama/0.12.5/data.yml diff --git a/appstore/ollama/0.12.4/docker-compose.yml b/appstore/ollama/0.12.5/docker-compose.yml similarity index 95% rename from appstore/ollama/0.12.4/docker-compose.yml rename to appstore/ollama/0.12.5/docker-compose.yml index d9bed0a31..2ae64ca65 100644 --- a/appstore/ollama/0.12.4/docker-compose.yml +++ b/appstore/ollama/0.12.5/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.12.4 + image: ollama/ollama:0.12.5 labels: createdBy: Apps networks: diff --git a/appstore/ollama/0.12.4/envs/default.env b/appstore/ollama/0.12.5/envs/default.env similarity index 100% rename from appstore/ollama/0.12.4/envs/default.env rename to appstore/ollama/0.12.5/envs/default.env diff --git a/appstore/ollama/0.12.4/envs/global.env b/appstore/ollama/0.12.5/envs/global.env similarity index 100% rename from appstore/ollama/0.12.4/envs/global.env rename to appstore/ollama/0.12.5/envs/global.env diff --git a/appstore/ollama/0.12.4/scripts/init.sh b/appstore/ollama/0.12.5/scripts/init.sh similarity index 100% rename from appstore/ollama/0.12.4/scripts/init.sh rename to appstore/ollama/0.12.5/scripts/init.sh diff --git a/appstore/ollama/0.12.4/scripts/uninstall.sh b/appstore/ollama/0.12.5/scripts/uninstall.sh similarity index 100% rename from appstore/ollama/0.12.4/scripts/uninstall.sh rename to appstore/ollama/0.12.5/scripts/uninstall.sh diff --git a/appstore/ollama/0.12.4/scripts/upgrade.sh b/appstore/ollama/0.12.5/scripts/upgrade.sh similarity index 100% rename from appstore/ollama/0.12.4/scripts/upgrade.sh rename to appstore/ollama/0.12.5/scripts/upgrade.sh diff --git a/appstore/slink/1.7.0/.env b/appstore/slink/1.7.1/.env similarity index 100% rename from appstore/slink/1.7.0/.env rename to appstore/slink/1.7.1/.env diff --git a/appstore/slink/1.7.0/data.yml b/appstore/slink/1.7.1/data.yml similarity index 100% rename from appstore/slink/1.7.0/data.yml rename to appstore/slink/1.7.1/data.yml diff --git a/appstore/slink/1.7.0/docker-compose.yml b/appstore/slink/1.7.1/docker-compose.yml similarity index 94% rename from appstore/slink/1.7.0/docker-compose.yml rename to appstore/slink/1.7.1/docker-compose.yml index ad6021568..59d2bb5e7 100644 --- a/appstore/slink/1.7.0/docker-compose.yml +++ b/appstore/slink/1.7.1/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.7.0 + image: anirdev/slink:v1.7.1 labels: createdBy: Apps networks: diff --git a/appstore/slink/1.7.0/envs/default.env b/appstore/slink/1.7.1/envs/default.env similarity index 100% rename from appstore/slink/1.7.0/envs/default.env rename to appstore/slink/1.7.1/envs/default.env diff --git a/appstore/slink/1.7.0/envs/global.env b/appstore/slink/1.7.1/envs/global.env similarity index 100% rename from appstore/slink/1.7.0/envs/global.env rename to appstore/slink/1.7.1/envs/global.env diff --git a/appstore/slink/1.7.0/scripts/init.sh b/appstore/slink/1.7.1/scripts/init.sh similarity index 100% rename from appstore/slink/1.7.0/scripts/init.sh rename to appstore/slink/1.7.1/scripts/init.sh diff --git a/appstore/slink/1.7.0/scripts/uninstall.sh b/appstore/slink/1.7.1/scripts/uninstall.sh similarity index 100% rename from appstore/slink/1.7.0/scripts/uninstall.sh rename to appstore/slink/1.7.1/scripts/uninstall.sh diff --git a/appstore/slink/1.7.0/scripts/upgrade.sh b/appstore/slink/1.7.1/scripts/upgrade.sh similarity index 100% rename from appstore/slink/1.7.0/scripts/upgrade.sh rename to appstore/slink/1.7.1/scripts/upgrade.sh diff --git a/appstore/super-productivity/15.1.1/.env b/appstore/super-productivity/15.2.0/.env similarity index 100% rename from appstore/super-productivity/15.1.1/.env rename to appstore/super-productivity/15.2.0/.env diff --git a/appstore/super-productivity/15.1.1/conf/webdav.yaml b/appstore/super-productivity/15.2.0/conf/webdav.yaml similarity index 100% rename from appstore/super-productivity/15.1.1/conf/webdav.yaml rename to appstore/super-productivity/15.2.0/conf/webdav.yaml diff --git a/appstore/super-productivity/15.1.1/data.yml b/appstore/super-productivity/15.2.0/data.yml similarity index 100% rename from appstore/super-productivity/15.1.1/data.yml rename to appstore/super-productivity/15.2.0/data.yml diff --git a/appstore/super-productivity/15.1.1/docker-compose.yml b/appstore/super-productivity/15.2.0/docker-compose.yml similarity index 93% rename from appstore/super-productivity/15.1.1/docker-compose.yml rename to appstore/super-productivity/15.2.0/docker-compose.yml index 3ffdcd009..eb9500058 100644 --- a/appstore/super-productivity/15.1.1/docker-compose.yml +++ b/appstore/super-productivity/15.2.0/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.1.1 + image: johannesjo/super-productivity:v15.2.0 labels: createdBy: Apps networks: diff --git a/appstore/super-productivity/15.1.1/envs/default.env b/appstore/super-productivity/15.2.0/envs/default.env similarity index 100% rename from appstore/super-productivity/15.1.1/envs/default.env rename to appstore/super-productivity/15.2.0/envs/default.env diff --git a/appstore/super-productivity/15.1.1/envs/global.env b/appstore/super-productivity/15.2.0/envs/global.env similarity index 100% rename from appstore/super-productivity/15.1.1/envs/global.env rename to appstore/super-productivity/15.2.0/envs/global.env diff --git a/appstore/super-productivity/15.1.1/scripts/init.sh b/appstore/super-productivity/15.2.0/scripts/init.sh similarity index 100% rename from appstore/super-productivity/15.1.1/scripts/init.sh rename to appstore/super-productivity/15.2.0/scripts/init.sh diff --git a/appstore/super-productivity/15.1.1/scripts/uninstall.sh b/appstore/super-productivity/15.2.0/scripts/uninstall.sh similarity index 100% rename from appstore/super-productivity/15.1.1/scripts/uninstall.sh rename to appstore/super-productivity/15.2.0/scripts/uninstall.sh diff --git a/appstore/super-productivity/15.1.1/scripts/upgrade.sh b/appstore/super-productivity/15.2.0/scripts/upgrade.sh similarity index 100% rename from appstore/super-productivity/15.1.1/scripts/upgrade.sh rename to appstore/super-productivity/15.2.0/scripts/upgrade.sh diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index b8eb2eac4..8568f94b3 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.40.0 + image: ghcr.io/ajnart/homarr:0.16.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_0/.env b/dockge/homarr_1_41_0/.env similarity index 67% rename from dockge/homarr_0_16_0/.env rename to dockge/homarr_1_41_0/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr_0_16_0/.env +++ b/dockge/homarr_1_41_0/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr_0_16_0/docker-compose.yml b/dockge/homarr_1_41_0/docker-compose.yml similarity index 89% rename from dockge/homarr_0_16_0/docker-compose.yml rename to dockge/homarr_1_41_0/docker-compose.yml index 8568f94b3..06b42b32c 100644 --- a/dockge/homarr_0_16_0/docker-compose.yml +++ b/dockge/homarr_1_41_0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_0/envs/default.env b/dockge/homarr_1_41_0/envs/default.env similarity index 100% rename from dockge/homarr_0_16_0/envs/default.env rename to dockge/homarr_1_41_0/envs/default.env diff --git a/dockge/homarr_0_16_0/envs/global.env b/dockge/homarr_1_41_0/envs/global.env similarity index 100% rename from dockge/homarr_0_16_0/envs/global.env rename to dockge/homarr_1_41_0/envs/global.env diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml index d9bed0a31..2ae64ca65 100644 --- a/dockge/ollama/docker-compose.yml +++ b/dockge/ollama/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.12.4 + image: ollama/ollama:0.12.5 labels: createdBy: Apps networks: diff --git a/dockge/slink/docker-compose.yml b/dockge/slink/docker-compose.yml index ad6021568..59d2bb5e7 100644 --- a/dockge/slink/docker-compose.yml +++ b/dockge/slink/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.7.0 + image: anirdev/slink:v1.7.1 labels: createdBy: Apps networks: diff --git a/dockge/super-productivity/docker-compose.yml b/dockge/super-productivity/docker-compose.yml index 3ffdcd009..eb9500058 100644 --- a/dockge/super-productivity/docker-compose.yml +++ b/dockge/super-productivity/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.1.1 + image: johannesjo/super-productivity:v15.2.0 labels: createdBy: Apps networks: From 59ad44e86967cc5c3fe7d1be5b38aba39c65e9ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 05:29:55 +0000 Subject: [PATCH 070/262] Update ghost Docker tag to v6.3.1 --- apps/ghost/6.3.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ghost/6.3.0/docker-compose.yml b/apps/ghost/6.3.0/docker-compose.yml index 876caff28..ba0ecb054 100644 --- a/apps/ghost/6.3.0/docker-compose.yml +++ b/apps/ghost/6.3.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ghost: - image: ghost:6.3.0 + image: ghost:6.3.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 270b51e1e1ffce67c68ae51fac79ed34081dcc3e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 05:29:59 +0000 Subject: [PATCH 071/262] Update sn0wl1n/ech0 Docker tag to v2.7.8 --- apps/ech0/2.7.7/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.7.7/docker-compose.yml b/apps/ech0/2.7.7/docker-compose.yml index 17d4dffaf..f6f9841ec 100644 --- a/apps/ech0/2.7.7/docker-compose.yml +++ b/apps/ech0/2.7.7/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.7.7 + image: sn0wl1n/ech0:v2.7.8 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 2573b5a55bba5db392e04882e000f70955dbcf2d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 05:30:08 +0000 Subject: [PATCH 072/262] Update app version [skip ci] --- apps/ghost/{6.3.0 => 6.3.1}/data.yml | 0 apps/ghost/{6.3.0 => 6.3.1}/docker-compose.yml | 0 apps/ghost/{6.3.0 => 6.3.1}/envs/default.env | 0 apps/ghost/{6.3.0 => 6.3.1}/envs/global.env | 0 apps/ghost/{6.3.0 => 6.3.1}/scripts/init.sh | 0 apps/ghost/{6.3.0 => 6.3.1}/scripts/uninstall.sh | 0 apps/ghost/{6.3.0 => 6.3.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ghost/{6.3.0 => 6.3.1}/data.yml (100%) rename apps/ghost/{6.3.0 => 6.3.1}/docker-compose.yml (100%) rename apps/ghost/{6.3.0 => 6.3.1}/envs/default.env (100%) rename apps/ghost/{6.3.0 => 6.3.1}/envs/global.env (100%) rename apps/ghost/{6.3.0 => 6.3.1}/scripts/init.sh (100%) rename apps/ghost/{6.3.0 => 6.3.1}/scripts/uninstall.sh (100%) rename apps/ghost/{6.3.0 => 6.3.1}/scripts/upgrade.sh (100%) diff --git a/apps/ghost/6.3.0/data.yml b/apps/ghost/6.3.1/data.yml similarity index 100% rename from apps/ghost/6.3.0/data.yml rename to apps/ghost/6.3.1/data.yml diff --git a/apps/ghost/6.3.0/docker-compose.yml b/apps/ghost/6.3.1/docker-compose.yml similarity index 100% rename from apps/ghost/6.3.0/docker-compose.yml rename to apps/ghost/6.3.1/docker-compose.yml diff --git a/apps/ghost/6.3.0/envs/default.env b/apps/ghost/6.3.1/envs/default.env similarity index 100% rename from apps/ghost/6.3.0/envs/default.env rename to apps/ghost/6.3.1/envs/default.env diff --git a/apps/ghost/6.3.0/envs/global.env b/apps/ghost/6.3.1/envs/global.env similarity index 100% rename from apps/ghost/6.3.0/envs/global.env rename to apps/ghost/6.3.1/envs/global.env diff --git a/apps/ghost/6.3.0/scripts/init.sh b/apps/ghost/6.3.1/scripts/init.sh similarity index 100% rename from apps/ghost/6.3.0/scripts/init.sh rename to apps/ghost/6.3.1/scripts/init.sh diff --git a/apps/ghost/6.3.0/scripts/uninstall.sh b/apps/ghost/6.3.1/scripts/uninstall.sh similarity index 100% rename from apps/ghost/6.3.0/scripts/uninstall.sh rename to apps/ghost/6.3.1/scripts/uninstall.sh diff --git a/apps/ghost/6.3.0/scripts/upgrade.sh b/apps/ghost/6.3.1/scripts/upgrade.sh similarity index 100% rename from apps/ghost/6.3.0/scripts/upgrade.sh rename to apps/ghost/6.3.1/scripts/upgrade.sh From 4656a50307cd19c4c813b7b97b440fea9d5313c4 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 05:30:10 +0000 Subject: [PATCH 073/262] Update app version [skip ci] --- apps/ech0/{2.7.7 => 2.7.8}/data.yml | 0 apps/ech0/{2.7.7 => 2.7.8}/docker-compose.yml | 0 apps/ech0/{2.7.7 => 2.7.8}/envs/default.env | 0 apps/ech0/{2.7.7 => 2.7.8}/envs/global.env | 0 apps/ech0/{2.7.7 => 2.7.8}/scripts/init.sh | 0 apps/ech0/{2.7.7 => 2.7.8}/scripts/uninstall.sh | 0 apps/ech0/{2.7.7 => 2.7.8}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.7.7 => 2.7.8}/data.yml (100%) rename apps/ech0/{2.7.7 => 2.7.8}/docker-compose.yml (100%) rename apps/ech0/{2.7.7 => 2.7.8}/envs/default.env (100%) rename apps/ech0/{2.7.7 => 2.7.8}/envs/global.env (100%) rename apps/ech0/{2.7.7 => 2.7.8}/scripts/init.sh (100%) rename apps/ech0/{2.7.7 => 2.7.8}/scripts/uninstall.sh (100%) rename apps/ech0/{2.7.7 => 2.7.8}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.7.7/data.yml b/apps/ech0/2.7.8/data.yml similarity index 100% rename from apps/ech0/2.7.7/data.yml rename to apps/ech0/2.7.8/data.yml diff --git a/apps/ech0/2.7.7/docker-compose.yml b/apps/ech0/2.7.8/docker-compose.yml similarity index 100% rename from apps/ech0/2.7.7/docker-compose.yml rename to apps/ech0/2.7.8/docker-compose.yml diff --git a/apps/ech0/2.7.7/envs/default.env b/apps/ech0/2.7.8/envs/default.env similarity index 100% rename from apps/ech0/2.7.7/envs/default.env rename to apps/ech0/2.7.8/envs/default.env diff --git a/apps/ech0/2.7.7/envs/global.env b/apps/ech0/2.7.8/envs/global.env similarity index 100% rename from apps/ech0/2.7.7/envs/global.env rename to apps/ech0/2.7.8/envs/global.env diff --git a/apps/ech0/2.7.7/scripts/init.sh b/apps/ech0/2.7.8/scripts/init.sh similarity index 100% rename from apps/ech0/2.7.7/scripts/init.sh rename to apps/ech0/2.7.8/scripts/init.sh diff --git a/apps/ech0/2.7.7/scripts/uninstall.sh b/apps/ech0/2.7.8/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.7.7/scripts/uninstall.sh rename to apps/ech0/2.7.8/scripts/uninstall.sh diff --git a/apps/ech0/2.7.7/scripts/upgrade.sh b/apps/ech0/2.7.8/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.7.7/scripts/upgrade.sh rename to apps/ech0/2.7.8/scripts/upgrade.sh From 33e9a56303984b0c95dcfe0ecf1e0bd5e8daa409 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 11 Oct 2025 06:28:12 +0000 Subject: [PATCH 074/262] Processed apps directory via GitHub Actions --- appstore/ech0/{2.7.7 => 2.7.8}/.env | 0 appstore/ech0/{2.7.7 => 2.7.8}/data.yml | 0 appstore/ech0/{2.7.7 => 2.7.8}/docker-compose.yml | 2 +- appstore/ech0/{2.7.7 => 2.7.8}/envs/default.env | 0 appstore/ech0/{2.7.7 => 2.7.8}/envs/global.env | 0 appstore/ech0/{2.7.7 => 2.7.8}/scripts/init.sh | 0 appstore/ech0/{2.7.7 => 2.7.8}/scripts/uninstall.sh | 0 appstore/ech0/{2.7.7 => 2.7.8}/scripts/upgrade.sh | 0 appstore/ghost/{6.3.0 => 6.3.1}/.env | 0 appstore/ghost/{6.3.0 => 6.3.1}/data.yml | 0 appstore/ghost/{6.3.0 => 6.3.1}/docker-compose.yml | 2 +- appstore/ghost/{6.3.0 => 6.3.1}/envs/default.env | 0 appstore/ghost/{6.3.0 => 6.3.1}/envs/global.env | 0 appstore/ghost/{6.3.0 => 6.3.1}/scripts/init.sh | 0 appstore/ghost/{6.3.0 => 6.3.1}/scripts/uninstall.sh | 0 appstore/ghost/{6.3.0 => 6.3.1}/scripts/upgrade.sh | 0 dockge/ech0/docker-compose.yml | 2 +- dockge/ghost/docker-compose.yml | 2 +- 18 files changed, 4 insertions(+), 4 deletions(-) rename appstore/ech0/{2.7.7 => 2.7.8}/.env (100%) rename appstore/ech0/{2.7.7 => 2.7.8}/data.yml (100%) rename appstore/ech0/{2.7.7 => 2.7.8}/docker-compose.yml (93%) rename appstore/ech0/{2.7.7 => 2.7.8}/envs/default.env (100%) rename appstore/ech0/{2.7.7 => 2.7.8}/envs/global.env (100%) rename appstore/ech0/{2.7.7 => 2.7.8}/scripts/init.sh (100%) rename appstore/ech0/{2.7.7 => 2.7.8}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.7.7 => 2.7.8}/scripts/upgrade.sh (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/.env (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/data.yml (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/docker-compose.yml (95%) rename appstore/ghost/{6.3.0 => 6.3.1}/envs/default.env (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/envs/global.env (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/scripts/init.sh (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/scripts/uninstall.sh (100%) rename appstore/ghost/{6.3.0 => 6.3.1}/scripts/upgrade.sh (100%) diff --git a/appstore/ech0/2.7.7/.env b/appstore/ech0/2.7.8/.env similarity index 100% rename from appstore/ech0/2.7.7/.env rename to appstore/ech0/2.7.8/.env diff --git a/appstore/ech0/2.7.7/data.yml b/appstore/ech0/2.7.8/data.yml similarity index 100% rename from appstore/ech0/2.7.7/data.yml rename to appstore/ech0/2.7.8/data.yml diff --git a/appstore/ech0/2.7.7/docker-compose.yml b/appstore/ech0/2.7.8/docker-compose.yml similarity index 93% rename from appstore/ech0/2.7.7/docker-compose.yml rename to appstore/ech0/2.7.8/docker-compose.yml index dd04faef0..03c3af232 100644 --- a/appstore/ech0/2.7.7/docker-compose.yml +++ b/appstore/ech0/2.7.8/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.7 + image: sn0wl1n/ech0:v2.7.8 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.7.7/envs/default.env b/appstore/ech0/2.7.8/envs/default.env similarity index 100% rename from appstore/ech0/2.7.7/envs/default.env rename to appstore/ech0/2.7.8/envs/default.env diff --git a/appstore/ech0/2.7.7/envs/global.env b/appstore/ech0/2.7.8/envs/global.env similarity index 100% rename from appstore/ech0/2.7.7/envs/global.env rename to appstore/ech0/2.7.8/envs/global.env diff --git a/appstore/ech0/2.7.7/scripts/init.sh b/appstore/ech0/2.7.8/scripts/init.sh similarity index 100% rename from appstore/ech0/2.7.7/scripts/init.sh rename to appstore/ech0/2.7.8/scripts/init.sh diff --git a/appstore/ech0/2.7.7/scripts/uninstall.sh b/appstore/ech0/2.7.8/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.7.7/scripts/uninstall.sh rename to appstore/ech0/2.7.8/scripts/uninstall.sh diff --git a/appstore/ech0/2.7.7/scripts/upgrade.sh b/appstore/ech0/2.7.8/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.7.7/scripts/upgrade.sh rename to appstore/ech0/2.7.8/scripts/upgrade.sh diff --git a/appstore/ghost/6.3.0/.env b/appstore/ghost/6.3.1/.env similarity index 100% rename from appstore/ghost/6.3.0/.env rename to appstore/ghost/6.3.1/.env diff --git a/appstore/ghost/6.3.0/data.yml b/appstore/ghost/6.3.1/data.yml similarity index 100% rename from appstore/ghost/6.3.0/data.yml rename to appstore/ghost/6.3.1/data.yml diff --git a/appstore/ghost/6.3.0/docker-compose.yml b/appstore/ghost/6.3.1/docker-compose.yml similarity index 95% rename from appstore/ghost/6.3.0/docker-compose.yml rename to appstore/ghost/6.3.1/docker-compose.yml index 8cdc04fa9..2e1eb2524 100644 --- a/appstore/ghost/6.3.0/docker-compose.yml +++ b/appstore/ghost/6.3.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.3.0 + image: ghost:6.3.1 labels: createdBy: Apps networks: diff --git a/appstore/ghost/6.3.0/envs/default.env b/appstore/ghost/6.3.1/envs/default.env similarity index 100% rename from appstore/ghost/6.3.0/envs/default.env rename to appstore/ghost/6.3.1/envs/default.env diff --git a/appstore/ghost/6.3.0/envs/global.env b/appstore/ghost/6.3.1/envs/global.env similarity index 100% rename from appstore/ghost/6.3.0/envs/global.env rename to appstore/ghost/6.3.1/envs/global.env diff --git a/appstore/ghost/6.3.0/scripts/init.sh b/appstore/ghost/6.3.1/scripts/init.sh similarity index 100% rename from appstore/ghost/6.3.0/scripts/init.sh rename to appstore/ghost/6.3.1/scripts/init.sh diff --git a/appstore/ghost/6.3.0/scripts/uninstall.sh b/appstore/ghost/6.3.1/scripts/uninstall.sh similarity index 100% rename from appstore/ghost/6.3.0/scripts/uninstall.sh rename to appstore/ghost/6.3.1/scripts/uninstall.sh diff --git a/appstore/ghost/6.3.0/scripts/upgrade.sh b/appstore/ghost/6.3.1/scripts/upgrade.sh similarity index 100% rename from appstore/ghost/6.3.0/scripts/upgrade.sh rename to appstore/ghost/6.3.1/scripts/upgrade.sh diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index dd04faef0..03c3af232 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.7 + image: sn0wl1n/ech0:v2.7.8 labels: createdBy: Apps networks: diff --git a/dockge/ghost/docker-compose.yml b/dockge/ghost/docker-compose.yml index 8cdc04fa9..2e1eb2524 100644 --- a/dockge/ghost/docker-compose.yml +++ b/dockge/ghost/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.3.0 + image: ghost:6.3.1 labels: createdBy: Apps networks: From d29f82be90e0a18463f2e343111d977a72dde363 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 09:04:05 +0000 Subject: [PATCH 075/262] Update qyg2297248353/bili-fetcher Docker tag to v1.6.8 --- apps/bili-fetcher/1.6.7/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bili-fetcher/1.6.7/docker-compose.yml b/apps/bili-fetcher/1.6.7/docker-compose.yml index c98770484..1a6307df3 100644 --- a/apps/bili-fetcher/1.6.7/docker-compose.yml +++ b/apps/bili-fetcher/1.6.7/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: bili-fetcher-api: - image: qyg2297248353/bili-fetcher:v1.6.7 + image: qyg2297248353/bili-fetcher:v1.6.8 container_name: api-${CONTAINER_NAME} restart: always networks: From 1e9197f0c43eed25a393fdb4d1a95e086d25c692 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 09:04:15 +0000 Subject: [PATCH 076/262] Update app version [skip ci] --- apps/bili-fetcher/{1.6.7 => 1.6.8}/config/categories.json | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/config/config.yaml | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/config/scheduler_config.yaml | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/config/sql_statements_mysql.py | 0 .../bili-fetcher/{1.6.7 => 1.6.8}/config/sql_statements_sqlite.py | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/config/template.html | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/data.yml | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/docker-compose.yml | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/envs/default.env | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/envs/global.env | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/scripts/init.sh | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/scripts/uninstall.sh | 0 apps/bili-fetcher/{1.6.7 => 1.6.8}/scripts/upgrade.sh | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/config/categories.json (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/config/config.yaml (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/config/scheduler_config.yaml (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/config/sql_statements_mysql.py (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/config/sql_statements_sqlite.py (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/config/template.html (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/data.yml (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/docker-compose.yml (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/envs/default.env (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/envs/global.env (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/scripts/init.sh (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/scripts/uninstall.sh (100%) rename apps/bili-fetcher/{1.6.7 => 1.6.8}/scripts/upgrade.sh (100%) diff --git a/apps/bili-fetcher/1.6.7/config/categories.json b/apps/bili-fetcher/1.6.8/config/categories.json similarity index 100% rename from apps/bili-fetcher/1.6.7/config/categories.json rename to apps/bili-fetcher/1.6.8/config/categories.json diff --git a/apps/bili-fetcher/1.6.7/config/config.yaml b/apps/bili-fetcher/1.6.8/config/config.yaml similarity index 100% rename from apps/bili-fetcher/1.6.7/config/config.yaml rename to apps/bili-fetcher/1.6.8/config/config.yaml diff --git a/apps/bili-fetcher/1.6.7/config/scheduler_config.yaml b/apps/bili-fetcher/1.6.8/config/scheduler_config.yaml similarity index 100% rename from apps/bili-fetcher/1.6.7/config/scheduler_config.yaml rename to apps/bili-fetcher/1.6.8/config/scheduler_config.yaml diff --git a/apps/bili-fetcher/1.6.7/config/sql_statements_mysql.py b/apps/bili-fetcher/1.6.8/config/sql_statements_mysql.py similarity index 100% rename from apps/bili-fetcher/1.6.7/config/sql_statements_mysql.py rename to apps/bili-fetcher/1.6.8/config/sql_statements_mysql.py diff --git a/apps/bili-fetcher/1.6.7/config/sql_statements_sqlite.py b/apps/bili-fetcher/1.6.8/config/sql_statements_sqlite.py similarity index 100% rename from apps/bili-fetcher/1.6.7/config/sql_statements_sqlite.py rename to apps/bili-fetcher/1.6.8/config/sql_statements_sqlite.py diff --git a/apps/bili-fetcher/1.6.7/config/template.html b/apps/bili-fetcher/1.6.8/config/template.html similarity index 100% rename from apps/bili-fetcher/1.6.7/config/template.html rename to apps/bili-fetcher/1.6.8/config/template.html diff --git a/apps/bili-fetcher/1.6.7/data.yml b/apps/bili-fetcher/1.6.8/data.yml similarity index 100% rename from apps/bili-fetcher/1.6.7/data.yml rename to apps/bili-fetcher/1.6.8/data.yml diff --git a/apps/bili-fetcher/1.6.7/docker-compose.yml b/apps/bili-fetcher/1.6.8/docker-compose.yml similarity index 100% rename from apps/bili-fetcher/1.6.7/docker-compose.yml rename to apps/bili-fetcher/1.6.8/docker-compose.yml diff --git a/apps/bili-fetcher/1.6.7/envs/default.env b/apps/bili-fetcher/1.6.8/envs/default.env similarity index 100% rename from apps/bili-fetcher/1.6.7/envs/default.env rename to apps/bili-fetcher/1.6.8/envs/default.env diff --git a/apps/bili-fetcher/1.6.7/envs/global.env b/apps/bili-fetcher/1.6.8/envs/global.env similarity index 100% rename from apps/bili-fetcher/1.6.7/envs/global.env rename to apps/bili-fetcher/1.6.8/envs/global.env diff --git a/apps/bili-fetcher/1.6.7/scripts/init.sh b/apps/bili-fetcher/1.6.8/scripts/init.sh similarity index 100% rename from apps/bili-fetcher/1.6.7/scripts/init.sh rename to apps/bili-fetcher/1.6.8/scripts/init.sh diff --git a/apps/bili-fetcher/1.6.7/scripts/uninstall.sh b/apps/bili-fetcher/1.6.8/scripts/uninstall.sh similarity index 100% rename from apps/bili-fetcher/1.6.7/scripts/uninstall.sh rename to apps/bili-fetcher/1.6.8/scripts/uninstall.sh diff --git a/apps/bili-fetcher/1.6.7/scripts/upgrade.sh b/apps/bili-fetcher/1.6.8/scripts/upgrade.sh similarity index 100% rename from apps/bili-fetcher/1.6.7/scripts/upgrade.sh rename to apps/bili-fetcher/1.6.8/scripts/upgrade.sh From 9da6f9d8d7ef9d60794ae4ec5715d6c49057ee32 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 11 Oct 2025 09:18:52 +0000 Subject: [PATCH 077/262] Processed apps directory via GitHub Actions --- appstore/bili-fetcher/{1.6.7 => 1.6.8}/.env | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/categories.json | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/config.yaml | 0 .../bili-fetcher/{1.6.7 => 1.6.8}/config/scheduler_config.yaml | 0 .../{1.6.7 => 1.6.8}/config/sql_statements_mysql.py | 0 .../{1.6.7 => 1.6.8}/config/sql_statements_sqlite.py | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/template.html | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/data.yml | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/docker-compose.yml | 2 +- appstore/bili-fetcher/{1.6.7 => 1.6.8}/envs/default.env | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/envs/global.env | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/scripts/init.sh | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/scripts/uninstall.sh | 0 appstore/bili-fetcher/{1.6.7 => 1.6.8}/scripts/upgrade.sh | 0 dockge/bili-fetcher/docker-compose.yml | 2 +- 15 files changed, 2 insertions(+), 2 deletions(-) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/.env (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/categories.json (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/config.yaml (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/scheduler_config.yaml (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/sql_statements_mysql.py (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/sql_statements_sqlite.py (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/config/template.html (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/data.yml (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/docker-compose.yml (94%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/envs/default.env (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/envs/global.env (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/scripts/init.sh (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/scripts/uninstall.sh (100%) rename appstore/bili-fetcher/{1.6.7 => 1.6.8}/scripts/upgrade.sh (100%) diff --git a/appstore/bili-fetcher/1.6.7/.env b/appstore/bili-fetcher/1.6.8/.env similarity index 100% rename from appstore/bili-fetcher/1.6.7/.env rename to appstore/bili-fetcher/1.6.8/.env diff --git a/appstore/bili-fetcher/1.6.7/config/categories.json b/appstore/bili-fetcher/1.6.8/config/categories.json similarity index 100% rename from appstore/bili-fetcher/1.6.7/config/categories.json rename to appstore/bili-fetcher/1.6.8/config/categories.json diff --git a/appstore/bili-fetcher/1.6.7/config/config.yaml b/appstore/bili-fetcher/1.6.8/config/config.yaml similarity index 100% rename from appstore/bili-fetcher/1.6.7/config/config.yaml rename to appstore/bili-fetcher/1.6.8/config/config.yaml diff --git a/appstore/bili-fetcher/1.6.7/config/scheduler_config.yaml b/appstore/bili-fetcher/1.6.8/config/scheduler_config.yaml similarity index 100% rename from appstore/bili-fetcher/1.6.7/config/scheduler_config.yaml rename to appstore/bili-fetcher/1.6.8/config/scheduler_config.yaml diff --git a/appstore/bili-fetcher/1.6.7/config/sql_statements_mysql.py b/appstore/bili-fetcher/1.6.8/config/sql_statements_mysql.py similarity index 100% rename from appstore/bili-fetcher/1.6.7/config/sql_statements_mysql.py rename to appstore/bili-fetcher/1.6.8/config/sql_statements_mysql.py diff --git a/appstore/bili-fetcher/1.6.7/config/sql_statements_sqlite.py b/appstore/bili-fetcher/1.6.8/config/sql_statements_sqlite.py similarity index 100% rename from appstore/bili-fetcher/1.6.7/config/sql_statements_sqlite.py rename to appstore/bili-fetcher/1.6.8/config/sql_statements_sqlite.py diff --git a/appstore/bili-fetcher/1.6.7/config/template.html b/appstore/bili-fetcher/1.6.8/config/template.html similarity index 100% rename from appstore/bili-fetcher/1.6.7/config/template.html rename to appstore/bili-fetcher/1.6.8/config/template.html diff --git a/appstore/bili-fetcher/1.6.7/data.yml b/appstore/bili-fetcher/1.6.8/data.yml similarity index 100% rename from appstore/bili-fetcher/1.6.7/data.yml rename to appstore/bili-fetcher/1.6.8/data.yml diff --git a/appstore/bili-fetcher/1.6.7/docker-compose.yml b/appstore/bili-fetcher/1.6.8/docker-compose.yml similarity index 94% rename from appstore/bili-fetcher/1.6.7/docker-compose.yml rename to appstore/bili-fetcher/1.6.8/docker-compose.yml index dcdde88d9..d0284297f 100644 --- a/appstore/bili-fetcher/1.6.7/docker-compose.yml +++ b/appstore/bili-fetcher/1.6.8/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.7 + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: diff --git a/appstore/bili-fetcher/1.6.7/envs/default.env b/appstore/bili-fetcher/1.6.8/envs/default.env similarity index 100% rename from appstore/bili-fetcher/1.6.7/envs/default.env rename to appstore/bili-fetcher/1.6.8/envs/default.env diff --git a/appstore/bili-fetcher/1.6.7/envs/global.env b/appstore/bili-fetcher/1.6.8/envs/global.env similarity index 100% rename from appstore/bili-fetcher/1.6.7/envs/global.env rename to appstore/bili-fetcher/1.6.8/envs/global.env diff --git a/appstore/bili-fetcher/1.6.7/scripts/init.sh b/appstore/bili-fetcher/1.6.8/scripts/init.sh similarity index 100% rename from appstore/bili-fetcher/1.6.7/scripts/init.sh rename to appstore/bili-fetcher/1.6.8/scripts/init.sh diff --git a/appstore/bili-fetcher/1.6.7/scripts/uninstall.sh b/appstore/bili-fetcher/1.6.8/scripts/uninstall.sh similarity index 100% rename from appstore/bili-fetcher/1.6.7/scripts/uninstall.sh rename to appstore/bili-fetcher/1.6.8/scripts/uninstall.sh diff --git a/appstore/bili-fetcher/1.6.7/scripts/upgrade.sh b/appstore/bili-fetcher/1.6.8/scripts/upgrade.sh similarity index 100% rename from appstore/bili-fetcher/1.6.7/scripts/upgrade.sh rename to appstore/bili-fetcher/1.6.8/scripts/upgrade.sh diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index dcdde88d9..d0284297f 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.7 + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: From 2c1e4e372ffff47b28f987feda6b75c023649249 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 10:14:14 +0000 Subject: [PATCH 078/262] Update sn0wl1n/ech0 Docker tag to v2.7.10 --- apps/ech0/2.7.8/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.7.8/docker-compose.yml b/apps/ech0/2.7.8/docker-compose.yml index f6f9841ec..abadbddd4 100644 --- a/apps/ech0/2.7.8/docker-compose.yml +++ b/apps/ech0/2.7.8/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.7.8 + image: sn0wl1n/ech0:v2.7.10 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 93f8154c3d246a04a43c734db6f21db2f666be87 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 10:14:25 +0000 Subject: [PATCH 079/262] Update app version [skip ci] --- apps/ech0/{2.7.8 => 2.7.10}/data.yml | 0 apps/ech0/{2.7.8 => 2.7.10}/docker-compose.yml | 0 apps/ech0/{2.7.8 => 2.7.10}/envs/default.env | 0 apps/ech0/{2.7.8 => 2.7.10}/envs/global.env | 0 apps/ech0/{2.7.8 => 2.7.10}/scripts/init.sh | 0 apps/ech0/{2.7.8 => 2.7.10}/scripts/uninstall.sh | 0 apps/ech0/{2.7.8 => 2.7.10}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.7.8 => 2.7.10}/data.yml (100%) rename apps/ech0/{2.7.8 => 2.7.10}/docker-compose.yml (100%) rename apps/ech0/{2.7.8 => 2.7.10}/envs/default.env (100%) rename apps/ech0/{2.7.8 => 2.7.10}/envs/global.env (100%) rename apps/ech0/{2.7.8 => 2.7.10}/scripts/init.sh (100%) rename apps/ech0/{2.7.8 => 2.7.10}/scripts/uninstall.sh (100%) rename apps/ech0/{2.7.8 => 2.7.10}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.7.8/data.yml b/apps/ech0/2.7.10/data.yml similarity index 100% rename from apps/ech0/2.7.8/data.yml rename to apps/ech0/2.7.10/data.yml diff --git a/apps/ech0/2.7.8/docker-compose.yml b/apps/ech0/2.7.10/docker-compose.yml similarity index 100% rename from apps/ech0/2.7.8/docker-compose.yml rename to apps/ech0/2.7.10/docker-compose.yml diff --git a/apps/ech0/2.7.8/envs/default.env b/apps/ech0/2.7.10/envs/default.env similarity index 100% rename from apps/ech0/2.7.8/envs/default.env rename to apps/ech0/2.7.10/envs/default.env diff --git a/apps/ech0/2.7.8/envs/global.env b/apps/ech0/2.7.10/envs/global.env similarity index 100% rename from apps/ech0/2.7.8/envs/global.env rename to apps/ech0/2.7.10/envs/global.env diff --git a/apps/ech0/2.7.8/scripts/init.sh b/apps/ech0/2.7.10/scripts/init.sh similarity index 100% rename from apps/ech0/2.7.8/scripts/init.sh rename to apps/ech0/2.7.10/scripts/init.sh diff --git a/apps/ech0/2.7.8/scripts/uninstall.sh b/apps/ech0/2.7.10/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.7.8/scripts/uninstall.sh rename to apps/ech0/2.7.10/scripts/uninstall.sh diff --git a/apps/ech0/2.7.8/scripts/upgrade.sh b/apps/ech0/2.7.10/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.7.8/scripts/upgrade.sh rename to apps/ech0/2.7.10/scripts/upgrade.sh From 9dc81af3606bca94540672f174fc25bd062aa4e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 11:12:51 +0000 Subject: [PATCH 080/262] Update sissbruecker/linkding Docker tag to v1.44.1 --- apps/linkding/1.44.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/linkding/1.44.0/docker-compose.yml b/apps/linkding/1.44.0/docker-compose.yml index e0c34bab0..ed6df0f1d 100644 --- a/apps/linkding/1.44.0/docker-compose.yml +++ b/apps/linkding/1.44.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: linkding: - image: sissbruecker/linkding:1.44.0-plus + image: sissbruecker/linkding:1.44.1-plus container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 9e0c8bec32d95250cfd62c8d0cc2d50a6c3c10a2 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 11:13:02 +0000 Subject: [PATCH 081/262] Update app version [skip ci] --- apps/linkding/{1.44.0 => 1.44.1}/data.yml | 0 apps/linkding/{1.44.0 => 1.44.1}/docker-compose.yml | 0 apps/linkding/{1.44.0 => 1.44.1}/envs/default.env | 0 apps/linkding/{1.44.0 => 1.44.1}/envs/global.env | 0 apps/linkding/{1.44.0 => 1.44.1}/scripts/init.sh | 0 apps/linkding/{1.44.0 => 1.44.1}/scripts/uninstall.sh | 0 apps/linkding/{1.44.0 => 1.44.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/linkding/{1.44.0 => 1.44.1}/data.yml (100%) rename apps/linkding/{1.44.0 => 1.44.1}/docker-compose.yml (100%) rename apps/linkding/{1.44.0 => 1.44.1}/envs/default.env (100%) rename apps/linkding/{1.44.0 => 1.44.1}/envs/global.env (100%) rename apps/linkding/{1.44.0 => 1.44.1}/scripts/init.sh (100%) rename apps/linkding/{1.44.0 => 1.44.1}/scripts/uninstall.sh (100%) rename apps/linkding/{1.44.0 => 1.44.1}/scripts/upgrade.sh (100%) diff --git a/apps/linkding/1.44.0/data.yml b/apps/linkding/1.44.1/data.yml similarity index 100% rename from apps/linkding/1.44.0/data.yml rename to apps/linkding/1.44.1/data.yml diff --git a/apps/linkding/1.44.0/docker-compose.yml b/apps/linkding/1.44.1/docker-compose.yml similarity index 100% rename from apps/linkding/1.44.0/docker-compose.yml rename to apps/linkding/1.44.1/docker-compose.yml diff --git a/apps/linkding/1.44.0/envs/default.env b/apps/linkding/1.44.1/envs/default.env similarity index 100% rename from apps/linkding/1.44.0/envs/default.env rename to apps/linkding/1.44.1/envs/default.env diff --git a/apps/linkding/1.44.0/envs/global.env b/apps/linkding/1.44.1/envs/global.env similarity index 100% rename from apps/linkding/1.44.0/envs/global.env rename to apps/linkding/1.44.1/envs/global.env diff --git a/apps/linkding/1.44.0/scripts/init.sh b/apps/linkding/1.44.1/scripts/init.sh similarity index 100% rename from apps/linkding/1.44.0/scripts/init.sh rename to apps/linkding/1.44.1/scripts/init.sh diff --git a/apps/linkding/1.44.0/scripts/uninstall.sh b/apps/linkding/1.44.1/scripts/uninstall.sh similarity index 100% rename from apps/linkding/1.44.0/scripts/uninstall.sh rename to apps/linkding/1.44.1/scripts/uninstall.sh diff --git a/apps/linkding/1.44.0/scripts/upgrade.sh b/apps/linkding/1.44.1/scripts/upgrade.sh similarity index 100% rename from apps/linkding/1.44.0/scripts/upgrade.sh rename to apps/linkding/1.44.1/scripts/upgrade.sh From a05d8c879b2ffb99476c5900b65da2f683187fc3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 12:26:39 +0000 Subject: [PATCH 082/262] Update xhongc/music_tag_web Docker tag to v2.5.9 --- apps/music-tag-web/2.5.8/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/music-tag-web/2.5.8/docker-compose.yml b/apps/music-tag-web/2.5.8/docker-compose.yml index ba4f8a60c..43be6abf4 100644 --- a/apps/music-tag-web/2.5.8/docker-compose.yml +++ b/apps/music-tag-web/2.5.8/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: music_tag_web: - image: xhongc/music_tag_web:2.5.8 + image: xhongc/music_tag_web:2.5.9 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 4f25cf572e1efbb76e88091ad64c5e2d1c913dc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 12:26:43 +0000 Subject: [PATCH 083/262] Update sn0wl1n/ech0 Docker tag to v2.8.0 --- apps/ech0/2.7.10/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.7.10/docker-compose.yml b/apps/ech0/2.7.10/docker-compose.yml index abadbddd4..0caf94675 100644 --- a/apps/ech0/2.7.10/docker-compose.yml +++ b/apps/ech0/2.7.10/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.7.10 + image: sn0wl1n/ech0:v2.8.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 75ca4a64de422ee05ff7c09379d253d56d6f2696 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 12:26:50 +0000 Subject: [PATCH 084/262] Update app version [skip ci] --- apps/music-tag-web/{2.5.8 => 2.5.9}/data.yml | 0 apps/music-tag-web/{2.5.8 => 2.5.9}/docker-compose.yml | 0 apps/music-tag-web/{2.5.8 => 2.5.9}/envs/default.env | 0 apps/music-tag-web/{2.5.8 => 2.5.9}/envs/global.env | 0 apps/music-tag-web/{2.5.8 => 2.5.9}/scripts/init.sh | 0 apps/music-tag-web/{2.5.8 => 2.5.9}/scripts/uninstall.sh | 0 apps/music-tag-web/{2.5.8 => 2.5.9}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/music-tag-web/{2.5.8 => 2.5.9}/data.yml (100%) rename apps/music-tag-web/{2.5.8 => 2.5.9}/docker-compose.yml (100%) rename apps/music-tag-web/{2.5.8 => 2.5.9}/envs/default.env (100%) rename apps/music-tag-web/{2.5.8 => 2.5.9}/envs/global.env (100%) rename apps/music-tag-web/{2.5.8 => 2.5.9}/scripts/init.sh (100%) rename apps/music-tag-web/{2.5.8 => 2.5.9}/scripts/uninstall.sh (100%) rename apps/music-tag-web/{2.5.8 => 2.5.9}/scripts/upgrade.sh (100%) diff --git a/apps/music-tag-web/2.5.8/data.yml b/apps/music-tag-web/2.5.9/data.yml similarity index 100% rename from apps/music-tag-web/2.5.8/data.yml rename to apps/music-tag-web/2.5.9/data.yml diff --git a/apps/music-tag-web/2.5.8/docker-compose.yml b/apps/music-tag-web/2.5.9/docker-compose.yml similarity index 100% rename from apps/music-tag-web/2.5.8/docker-compose.yml rename to apps/music-tag-web/2.5.9/docker-compose.yml diff --git a/apps/music-tag-web/2.5.8/envs/default.env b/apps/music-tag-web/2.5.9/envs/default.env similarity index 100% rename from apps/music-tag-web/2.5.8/envs/default.env rename to apps/music-tag-web/2.5.9/envs/default.env diff --git a/apps/music-tag-web/2.5.8/envs/global.env b/apps/music-tag-web/2.5.9/envs/global.env similarity index 100% rename from apps/music-tag-web/2.5.8/envs/global.env rename to apps/music-tag-web/2.5.9/envs/global.env diff --git a/apps/music-tag-web/2.5.8/scripts/init.sh b/apps/music-tag-web/2.5.9/scripts/init.sh similarity index 100% rename from apps/music-tag-web/2.5.8/scripts/init.sh rename to apps/music-tag-web/2.5.9/scripts/init.sh diff --git a/apps/music-tag-web/2.5.8/scripts/uninstall.sh b/apps/music-tag-web/2.5.9/scripts/uninstall.sh similarity index 100% rename from apps/music-tag-web/2.5.8/scripts/uninstall.sh rename to apps/music-tag-web/2.5.9/scripts/uninstall.sh diff --git a/apps/music-tag-web/2.5.8/scripts/upgrade.sh b/apps/music-tag-web/2.5.9/scripts/upgrade.sh similarity index 100% rename from apps/music-tag-web/2.5.8/scripts/upgrade.sh rename to apps/music-tag-web/2.5.9/scripts/upgrade.sh From 2442af40bc003a45dd787fe2364e93b7c23482fe Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 12:26:55 +0000 Subject: [PATCH 085/262] Update app version [skip ci] --- apps/ech0/{2.7.10 => 2.8.0}/data.yml | 0 apps/ech0/{2.7.10 => 2.8.0}/docker-compose.yml | 0 apps/ech0/{2.7.10 => 2.8.0}/envs/default.env | 0 apps/ech0/{2.7.10 => 2.8.0}/envs/global.env | 0 apps/ech0/{2.7.10 => 2.8.0}/scripts/init.sh | 0 apps/ech0/{2.7.10 => 2.8.0}/scripts/uninstall.sh | 0 apps/ech0/{2.7.10 => 2.8.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.7.10 => 2.8.0}/data.yml (100%) rename apps/ech0/{2.7.10 => 2.8.0}/docker-compose.yml (100%) rename apps/ech0/{2.7.10 => 2.8.0}/envs/default.env (100%) rename apps/ech0/{2.7.10 => 2.8.0}/envs/global.env (100%) rename apps/ech0/{2.7.10 => 2.8.0}/scripts/init.sh (100%) rename apps/ech0/{2.7.10 => 2.8.0}/scripts/uninstall.sh (100%) rename apps/ech0/{2.7.10 => 2.8.0}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.7.10/data.yml b/apps/ech0/2.8.0/data.yml similarity index 100% rename from apps/ech0/2.7.10/data.yml rename to apps/ech0/2.8.0/data.yml diff --git a/apps/ech0/2.7.10/docker-compose.yml b/apps/ech0/2.8.0/docker-compose.yml similarity index 100% rename from apps/ech0/2.7.10/docker-compose.yml rename to apps/ech0/2.8.0/docker-compose.yml diff --git a/apps/ech0/2.7.10/envs/default.env b/apps/ech0/2.8.0/envs/default.env similarity index 100% rename from apps/ech0/2.7.10/envs/default.env rename to apps/ech0/2.8.0/envs/default.env diff --git a/apps/ech0/2.7.10/envs/global.env b/apps/ech0/2.8.0/envs/global.env similarity index 100% rename from apps/ech0/2.7.10/envs/global.env rename to apps/ech0/2.8.0/envs/global.env diff --git a/apps/ech0/2.7.10/scripts/init.sh b/apps/ech0/2.8.0/scripts/init.sh similarity index 100% rename from apps/ech0/2.7.10/scripts/init.sh rename to apps/ech0/2.8.0/scripts/init.sh diff --git a/apps/ech0/2.7.10/scripts/uninstall.sh b/apps/ech0/2.8.0/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.7.10/scripts/uninstall.sh rename to apps/ech0/2.8.0/scripts/uninstall.sh diff --git a/apps/ech0/2.7.10/scripts/upgrade.sh b/apps/ech0/2.8.0/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.7.10/scripts/upgrade.sh rename to apps/ech0/2.8.0/scripts/upgrade.sh From fc49490b4ceb01a4655425b4af22f5a1676583cc Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 11 Oct 2025 12:38:03 +0000 Subject: [PATCH 086/262] Processed apps directory via GitHub Actions --- appstore/ech0/{2.7.8 => 2.8.0}/.env | 0 appstore/ech0/{2.7.8 => 2.8.0}/data.yml | 0 appstore/ech0/{2.7.8 => 2.8.0}/docker-compose.yml | 2 +- appstore/ech0/{2.7.8 => 2.8.0}/envs/default.env | 0 appstore/ech0/{2.7.8 => 2.8.0}/envs/global.env | 0 appstore/ech0/{2.7.8 => 2.8.0}/scripts/init.sh | 0 appstore/ech0/{2.7.8 => 2.8.0}/scripts/uninstall.sh | 0 appstore/ech0/{2.7.8 => 2.8.0}/scripts/upgrade.sh | 0 appstore/linkding/{1.44.0 => 1.44.1}/.env | 0 appstore/linkding/{1.44.0 => 1.44.1}/data.yml | 0 appstore/linkding/{1.44.0 => 1.44.1}/docker-compose.yml | 2 +- appstore/linkding/{1.44.0 => 1.44.1}/envs/default.env | 0 appstore/linkding/{1.44.0 => 1.44.1}/envs/global.env | 0 appstore/linkding/{1.44.0 => 1.44.1}/scripts/init.sh | 0 appstore/linkding/{1.44.0 => 1.44.1}/scripts/uninstall.sh | 0 appstore/linkding/{1.44.0 => 1.44.1}/scripts/upgrade.sh | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/.env | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/data.yml | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/docker-compose.yml | 2 +- appstore/music-tag-web/{2.5.8 => 2.5.9}/envs/default.env | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/envs/global.env | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/scripts/init.sh | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/scripts/uninstall.sh | 0 appstore/music-tag-web/{2.5.8 => 2.5.9}/scripts/upgrade.sh | 0 dockge/ech0/docker-compose.yml | 2 +- dockge/linkding/docker-compose.yml | 2 +- dockge/music-tag-web/docker-compose.yml | 2 +- 27 files changed, 6 insertions(+), 6 deletions(-) rename appstore/ech0/{2.7.8 => 2.8.0}/.env (100%) rename appstore/ech0/{2.7.8 => 2.8.0}/data.yml (100%) rename appstore/ech0/{2.7.8 => 2.8.0}/docker-compose.yml (93%) rename appstore/ech0/{2.7.8 => 2.8.0}/envs/default.env (100%) rename appstore/ech0/{2.7.8 => 2.8.0}/envs/global.env (100%) rename appstore/ech0/{2.7.8 => 2.8.0}/scripts/init.sh (100%) rename appstore/ech0/{2.7.8 => 2.8.0}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.7.8 => 2.8.0}/scripts/upgrade.sh (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/.env (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/data.yml (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/docker-compose.yml (92%) rename appstore/linkding/{1.44.0 => 1.44.1}/envs/default.env (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/envs/global.env (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/scripts/init.sh (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/scripts/uninstall.sh (100%) rename appstore/linkding/{1.44.0 => 1.44.1}/scripts/upgrade.sh (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/.env (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/data.yml (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/docker-compose.yml (94%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/envs/default.env (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/envs/global.env (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/scripts/init.sh (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/scripts/uninstall.sh (100%) rename appstore/music-tag-web/{2.5.8 => 2.5.9}/scripts/upgrade.sh (100%) diff --git a/appstore/ech0/2.7.8/.env b/appstore/ech0/2.8.0/.env similarity index 100% rename from appstore/ech0/2.7.8/.env rename to appstore/ech0/2.8.0/.env diff --git a/appstore/ech0/2.7.8/data.yml b/appstore/ech0/2.8.0/data.yml similarity index 100% rename from appstore/ech0/2.7.8/data.yml rename to appstore/ech0/2.8.0/data.yml diff --git a/appstore/ech0/2.7.8/docker-compose.yml b/appstore/ech0/2.8.0/docker-compose.yml similarity index 93% rename from appstore/ech0/2.7.8/docker-compose.yml rename to appstore/ech0/2.8.0/docker-compose.yml index 03c3af232..524ebcafe 100644 --- a/appstore/ech0/2.7.8/docker-compose.yml +++ b/appstore/ech0/2.8.0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.8 + image: sn0wl1n/ech0:v2.8.0 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.7.8/envs/default.env b/appstore/ech0/2.8.0/envs/default.env similarity index 100% rename from appstore/ech0/2.7.8/envs/default.env rename to appstore/ech0/2.8.0/envs/default.env diff --git a/appstore/ech0/2.7.8/envs/global.env b/appstore/ech0/2.8.0/envs/global.env similarity index 100% rename from appstore/ech0/2.7.8/envs/global.env rename to appstore/ech0/2.8.0/envs/global.env diff --git a/appstore/ech0/2.7.8/scripts/init.sh b/appstore/ech0/2.8.0/scripts/init.sh similarity index 100% rename from appstore/ech0/2.7.8/scripts/init.sh rename to appstore/ech0/2.8.0/scripts/init.sh diff --git a/appstore/ech0/2.7.8/scripts/uninstall.sh b/appstore/ech0/2.8.0/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.7.8/scripts/uninstall.sh rename to appstore/ech0/2.8.0/scripts/uninstall.sh diff --git a/appstore/ech0/2.7.8/scripts/upgrade.sh b/appstore/ech0/2.8.0/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.7.8/scripts/upgrade.sh rename to appstore/ech0/2.8.0/scripts/upgrade.sh diff --git a/appstore/linkding/1.44.0/.env b/appstore/linkding/1.44.1/.env similarity index 100% rename from appstore/linkding/1.44.0/.env rename to appstore/linkding/1.44.1/.env diff --git a/appstore/linkding/1.44.0/data.yml b/appstore/linkding/1.44.1/data.yml similarity index 100% rename from appstore/linkding/1.44.0/data.yml rename to appstore/linkding/1.44.1/data.yml diff --git a/appstore/linkding/1.44.0/docker-compose.yml b/appstore/linkding/1.44.1/docker-compose.yml similarity index 92% rename from appstore/linkding/1.44.0/docker-compose.yml rename to appstore/linkding/1.44.1/docker-compose.yml index 39da7a875..a8c767bb0 100644 --- a/appstore/linkding/1.44.0/docker-compose.yml +++ b/appstore/linkding/1.44.1/docker-compose.yml @@ -12,7 +12,7 @@ services: - LD_DB_ENGINE=postgres - HTTP_PROXY=${ALL_PROXY} - HTTPS_PROXY=${ALL_PROXY} - image: sissbruecker/linkding:1.44.0-plus + image: sissbruecker/linkding:1.44.1-plus labels: createdBy: Apps networks: diff --git a/appstore/linkding/1.44.0/envs/default.env b/appstore/linkding/1.44.1/envs/default.env similarity index 100% rename from appstore/linkding/1.44.0/envs/default.env rename to appstore/linkding/1.44.1/envs/default.env diff --git a/appstore/linkding/1.44.0/envs/global.env b/appstore/linkding/1.44.1/envs/global.env similarity index 100% rename from appstore/linkding/1.44.0/envs/global.env rename to appstore/linkding/1.44.1/envs/global.env diff --git a/appstore/linkding/1.44.0/scripts/init.sh b/appstore/linkding/1.44.1/scripts/init.sh similarity index 100% rename from appstore/linkding/1.44.0/scripts/init.sh rename to appstore/linkding/1.44.1/scripts/init.sh diff --git a/appstore/linkding/1.44.0/scripts/uninstall.sh b/appstore/linkding/1.44.1/scripts/uninstall.sh similarity index 100% rename from appstore/linkding/1.44.0/scripts/uninstall.sh rename to appstore/linkding/1.44.1/scripts/uninstall.sh diff --git a/appstore/linkding/1.44.0/scripts/upgrade.sh b/appstore/linkding/1.44.1/scripts/upgrade.sh similarity index 100% rename from appstore/linkding/1.44.0/scripts/upgrade.sh rename to appstore/linkding/1.44.1/scripts/upgrade.sh diff --git a/appstore/music-tag-web/2.5.8/.env b/appstore/music-tag-web/2.5.9/.env similarity index 100% rename from appstore/music-tag-web/2.5.8/.env rename to appstore/music-tag-web/2.5.9/.env diff --git a/appstore/music-tag-web/2.5.8/data.yml b/appstore/music-tag-web/2.5.9/data.yml similarity index 100% rename from appstore/music-tag-web/2.5.8/data.yml rename to appstore/music-tag-web/2.5.9/data.yml diff --git a/appstore/music-tag-web/2.5.8/docker-compose.yml b/appstore/music-tag-web/2.5.9/docker-compose.yml similarity index 94% rename from appstore/music-tag-web/2.5.8/docker-compose.yml rename to appstore/music-tag-web/2.5.9/docker-compose.yml index a6131590e..e02a522e1 100644 --- a/appstore/music-tag-web/2.5.8/docker-compose.yml +++ b/appstore/music-tag-web/2.5.9/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: xhongc/music_tag_web:2.5.8 + image: xhongc/music_tag_web:2.5.9 labels: createdBy: Apps networks: diff --git a/appstore/music-tag-web/2.5.8/envs/default.env b/appstore/music-tag-web/2.5.9/envs/default.env similarity index 100% rename from appstore/music-tag-web/2.5.8/envs/default.env rename to appstore/music-tag-web/2.5.9/envs/default.env diff --git a/appstore/music-tag-web/2.5.8/envs/global.env b/appstore/music-tag-web/2.5.9/envs/global.env similarity index 100% rename from appstore/music-tag-web/2.5.8/envs/global.env rename to appstore/music-tag-web/2.5.9/envs/global.env diff --git a/appstore/music-tag-web/2.5.8/scripts/init.sh b/appstore/music-tag-web/2.5.9/scripts/init.sh similarity index 100% rename from appstore/music-tag-web/2.5.8/scripts/init.sh rename to appstore/music-tag-web/2.5.9/scripts/init.sh diff --git a/appstore/music-tag-web/2.5.8/scripts/uninstall.sh b/appstore/music-tag-web/2.5.9/scripts/uninstall.sh similarity index 100% rename from appstore/music-tag-web/2.5.8/scripts/uninstall.sh rename to appstore/music-tag-web/2.5.9/scripts/uninstall.sh diff --git a/appstore/music-tag-web/2.5.8/scripts/upgrade.sh b/appstore/music-tag-web/2.5.9/scripts/upgrade.sh similarity index 100% rename from appstore/music-tag-web/2.5.8/scripts/upgrade.sh rename to appstore/music-tag-web/2.5.9/scripts/upgrade.sh diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index 03c3af232..524ebcafe 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.7.8 + image: sn0wl1n/ech0:v2.8.0 labels: createdBy: Apps networks: diff --git a/dockge/linkding/docker-compose.yml b/dockge/linkding/docker-compose.yml index 39da7a875..a8c767bb0 100644 --- a/dockge/linkding/docker-compose.yml +++ b/dockge/linkding/docker-compose.yml @@ -12,7 +12,7 @@ services: - LD_DB_ENGINE=postgres - HTTP_PROXY=${ALL_PROXY} - HTTPS_PROXY=${ALL_PROXY} - image: sissbruecker/linkding:1.44.0-plus + image: sissbruecker/linkding:1.44.1-plus labels: createdBy: Apps networks: diff --git a/dockge/music-tag-web/docker-compose.yml b/dockge/music-tag-web/docker-compose.yml index a6131590e..e02a522e1 100644 --- a/dockge/music-tag-web/docker-compose.yml +++ b/dockge/music-tag-web/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: xhongc/music_tag_web:2.5.8 + image: xhongc/music_tag_web:2.5.9 labels: createdBy: Apps networks: From dccc26d03f3ddabd1c0a8245a47846c0b70e58b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 17:46:29 +0000 Subject: [PATCH 087/262] Update anirdev/slink Docker tag to v1.7.2 --- apps/slink/1.7.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/slink/1.7.1/docker-compose.yml b/apps/slink/1.7.1/docker-compose.yml index 5cddd9677..b59b2b242 100644 --- a/apps/slink/1.7.1/docker-compose.yml +++ b/apps/slink/1.7.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: slink: - image: anirdev/slink:v1.7.1 + image: anirdev/slink:v1.7.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 4c739f6a861827c4a0498ef6100989530efec44c Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 17:46:40 +0000 Subject: [PATCH 088/262] Update app version [skip ci] --- apps/slink/{1.7.1 => 1.7.2}/data.yml | 0 apps/slink/{1.7.1 => 1.7.2}/docker-compose.yml | 0 apps/slink/{1.7.1 => 1.7.2}/envs/default.env | 0 apps/slink/{1.7.1 => 1.7.2}/envs/global.env | 0 apps/slink/{1.7.1 => 1.7.2}/scripts/init.sh | 0 apps/slink/{1.7.1 => 1.7.2}/scripts/uninstall.sh | 0 apps/slink/{1.7.1 => 1.7.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/slink/{1.7.1 => 1.7.2}/data.yml (100%) rename apps/slink/{1.7.1 => 1.7.2}/docker-compose.yml (100%) rename apps/slink/{1.7.1 => 1.7.2}/envs/default.env (100%) rename apps/slink/{1.7.1 => 1.7.2}/envs/global.env (100%) rename apps/slink/{1.7.1 => 1.7.2}/scripts/init.sh (100%) rename apps/slink/{1.7.1 => 1.7.2}/scripts/uninstall.sh (100%) rename apps/slink/{1.7.1 => 1.7.2}/scripts/upgrade.sh (100%) diff --git a/apps/slink/1.7.1/data.yml b/apps/slink/1.7.2/data.yml similarity index 100% rename from apps/slink/1.7.1/data.yml rename to apps/slink/1.7.2/data.yml diff --git a/apps/slink/1.7.1/docker-compose.yml b/apps/slink/1.7.2/docker-compose.yml similarity index 100% rename from apps/slink/1.7.1/docker-compose.yml rename to apps/slink/1.7.2/docker-compose.yml diff --git a/apps/slink/1.7.1/envs/default.env b/apps/slink/1.7.2/envs/default.env similarity index 100% rename from apps/slink/1.7.1/envs/default.env rename to apps/slink/1.7.2/envs/default.env diff --git a/apps/slink/1.7.1/envs/global.env b/apps/slink/1.7.2/envs/global.env similarity index 100% rename from apps/slink/1.7.1/envs/global.env rename to apps/slink/1.7.2/envs/global.env diff --git a/apps/slink/1.7.1/scripts/init.sh b/apps/slink/1.7.2/scripts/init.sh similarity index 100% rename from apps/slink/1.7.1/scripts/init.sh rename to apps/slink/1.7.2/scripts/init.sh diff --git a/apps/slink/1.7.1/scripts/uninstall.sh b/apps/slink/1.7.2/scripts/uninstall.sh similarity index 100% rename from apps/slink/1.7.1/scripts/uninstall.sh rename to apps/slink/1.7.2/scripts/uninstall.sh diff --git a/apps/slink/1.7.1/scripts/upgrade.sh b/apps/slink/1.7.2/scripts/upgrade.sh similarity index 100% rename from apps/slink/1.7.1/scripts/upgrade.sh rename to apps/slink/1.7.2/scripts/upgrade.sh From c88206cef0724d1c8c64ec930711c73579261abb Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 11 Oct 2025 18:25:22 +0000 Subject: [PATCH 089/262] Processed apps directory via GitHub Actions --- appstore/slink/{1.7.1 => 1.7.2}/.env | 0 appstore/slink/{1.7.1 => 1.7.2}/data.yml | 0 appstore/slink/{1.7.1 => 1.7.2}/docker-compose.yml | 2 +- appstore/slink/{1.7.1 => 1.7.2}/envs/default.env | 0 appstore/slink/{1.7.1 => 1.7.2}/envs/global.env | 0 appstore/slink/{1.7.1 => 1.7.2}/scripts/init.sh | 0 appstore/slink/{1.7.1 => 1.7.2}/scripts/uninstall.sh | 0 appstore/slink/{1.7.1 => 1.7.2}/scripts/upgrade.sh | 0 dockge/slink/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/slink/{1.7.1 => 1.7.2}/.env (100%) rename appstore/slink/{1.7.1 => 1.7.2}/data.yml (100%) rename appstore/slink/{1.7.1 => 1.7.2}/docker-compose.yml (94%) rename appstore/slink/{1.7.1 => 1.7.2}/envs/default.env (100%) rename appstore/slink/{1.7.1 => 1.7.2}/envs/global.env (100%) rename appstore/slink/{1.7.1 => 1.7.2}/scripts/init.sh (100%) rename appstore/slink/{1.7.1 => 1.7.2}/scripts/uninstall.sh (100%) rename appstore/slink/{1.7.1 => 1.7.2}/scripts/upgrade.sh (100%) diff --git a/appstore/slink/1.7.1/.env b/appstore/slink/1.7.2/.env similarity index 100% rename from appstore/slink/1.7.1/.env rename to appstore/slink/1.7.2/.env diff --git a/appstore/slink/1.7.1/data.yml b/appstore/slink/1.7.2/data.yml similarity index 100% rename from appstore/slink/1.7.1/data.yml rename to appstore/slink/1.7.2/data.yml diff --git a/appstore/slink/1.7.1/docker-compose.yml b/appstore/slink/1.7.2/docker-compose.yml similarity index 94% rename from appstore/slink/1.7.1/docker-compose.yml rename to appstore/slink/1.7.2/docker-compose.yml index 59d2bb5e7..b39d28ff7 100644 --- a/appstore/slink/1.7.1/docker-compose.yml +++ b/appstore/slink/1.7.2/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.7.1 + image: anirdev/slink:v1.7.2 labels: createdBy: Apps networks: diff --git a/appstore/slink/1.7.1/envs/default.env b/appstore/slink/1.7.2/envs/default.env similarity index 100% rename from appstore/slink/1.7.1/envs/default.env rename to appstore/slink/1.7.2/envs/default.env diff --git a/appstore/slink/1.7.1/envs/global.env b/appstore/slink/1.7.2/envs/global.env similarity index 100% rename from appstore/slink/1.7.1/envs/global.env rename to appstore/slink/1.7.2/envs/global.env diff --git a/appstore/slink/1.7.1/scripts/init.sh b/appstore/slink/1.7.2/scripts/init.sh similarity index 100% rename from appstore/slink/1.7.1/scripts/init.sh rename to appstore/slink/1.7.2/scripts/init.sh diff --git a/appstore/slink/1.7.1/scripts/uninstall.sh b/appstore/slink/1.7.2/scripts/uninstall.sh similarity index 100% rename from appstore/slink/1.7.1/scripts/uninstall.sh rename to appstore/slink/1.7.2/scripts/uninstall.sh diff --git a/appstore/slink/1.7.1/scripts/upgrade.sh b/appstore/slink/1.7.2/scripts/upgrade.sh similarity index 100% rename from appstore/slink/1.7.1/scripts/upgrade.sh rename to appstore/slink/1.7.2/scripts/upgrade.sh diff --git a/dockge/slink/docker-compose.yml b/dockge/slink/docker-compose.yml index 59d2bb5e7..b39d28ff7 100644 --- a/dockge/slink/docker-compose.yml +++ b/dockge/slink/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.7.1 + image: anirdev/slink:v1.7.2 labels: createdBy: Apps networks: From fb93d43292d5260eb06430dcb63922e516d0b2ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 19:11:35 +0000 Subject: [PATCH 090/262] Update emby/embyserver Docker tag to v4.9.2.3 --- apps/emby/4.9.2.2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emby/4.9.2.2/docker-compose.yml b/apps/emby/4.9.2.2/docker-compose.yml index 5f9b101b7..3c9c14fc7 100644 --- a/apps/emby/4.9.2.2/docker-compose.yml +++ b/apps/emby/4.9.2.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby: - image: emby/embyserver:4.9.2.2 + image: emby/embyserver:4.9.2.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From bb5aacafa023092450a813071bd10c1f4e4606fb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Oct 2025 19:11:39 +0000 Subject: [PATCH 091/262] Update wushuo894/ani-rss Docker tag to v2.2.15 --- apps/ani-rss/2.2.14/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/2.2.14/docker-compose.yml b/apps/ani-rss/2.2.14/docker-compose.yml index 788bdd0d5..8992e8d01 100644 --- a/apps/ani-rss/2.2.14/docker-compose.yml +++ b/apps/ani-rss/2.2.14/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.2.14 + image: wushuo894/ani-rss:v2.2.15 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 4a3e621723c017e4bc1ad68793986313285fd9b8 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 19:11:45 +0000 Subject: [PATCH 092/262] Update app version [skip ci] --- apps/emby/{4.9.2.2 => 4.9.2.3}/data.yml | 0 apps/emby/{4.9.2.2 => 4.9.2.3}/docker-compose.yml | 0 apps/emby/{4.9.2.2 => 4.9.2.3}/envs/default.env | 0 apps/emby/{4.9.2.2 => 4.9.2.3}/envs/global.env | 0 apps/emby/{4.9.2.2 => 4.9.2.3}/scripts/init.sh | 0 apps/emby/{4.9.2.2 => 4.9.2.3}/scripts/uninstall.sh | 0 apps/emby/{4.9.2.2 => 4.9.2.3}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/emby/{4.9.2.2 => 4.9.2.3}/data.yml (100%) rename apps/emby/{4.9.2.2 => 4.9.2.3}/docker-compose.yml (100%) rename apps/emby/{4.9.2.2 => 4.9.2.3}/envs/default.env (100%) rename apps/emby/{4.9.2.2 => 4.9.2.3}/envs/global.env (100%) rename apps/emby/{4.9.2.2 => 4.9.2.3}/scripts/init.sh (100%) rename apps/emby/{4.9.2.2 => 4.9.2.3}/scripts/uninstall.sh (100%) rename apps/emby/{4.9.2.2 => 4.9.2.3}/scripts/upgrade.sh (100%) diff --git a/apps/emby/4.9.2.2/data.yml b/apps/emby/4.9.2.3/data.yml similarity index 100% rename from apps/emby/4.9.2.2/data.yml rename to apps/emby/4.9.2.3/data.yml diff --git a/apps/emby/4.9.2.2/docker-compose.yml b/apps/emby/4.9.2.3/docker-compose.yml similarity index 100% rename from apps/emby/4.9.2.2/docker-compose.yml rename to apps/emby/4.9.2.3/docker-compose.yml diff --git a/apps/emby/4.9.2.2/envs/default.env b/apps/emby/4.9.2.3/envs/default.env similarity index 100% rename from apps/emby/4.9.2.2/envs/default.env rename to apps/emby/4.9.2.3/envs/default.env diff --git a/apps/emby/4.9.2.2/envs/global.env b/apps/emby/4.9.2.3/envs/global.env similarity index 100% rename from apps/emby/4.9.2.2/envs/global.env rename to apps/emby/4.9.2.3/envs/global.env diff --git a/apps/emby/4.9.2.2/scripts/init.sh b/apps/emby/4.9.2.3/scripts/init.sh similarity index 100% rename from apps/emby/4.9.2.2/scripts/init.sh rename to apps/emby/4.9.2.3/scripts/init.sh diff --git a/apps/emby/4.9.2.2/scripts/uninstall.sh b/apps/emby/4.9.2.3/scripts/uninstall.sh similarity index 100% rename from apps/emby/4.9.2.2/scripts/uninstall.sh rename to apps/emby/4.9.2.3/scripts/uninstall.sh diff --git a/apps/emby/4.9.2.2/scripts/upgrade.sh b/apps/emby/4.9.2.3/scripts/upgrade.sh similarity index 100% rename from apps/emby/4.9.2.2/scripts/upgrade.sh rename to apps/emby/4.9.2.3/scripts/upgrade.sh From b9497676ffefe84b0fc23ec2551c66ef3622ae50 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 11 Oct 2025 19:11:48 +0000 Subject: [PATCH 093/262] Update app version [skip ci] --- apps/ani-rss/{2.2.14 => 2.2.15}/data.yml | 0 apps/ani-rss/{2.2.14 => 2.2.15}/docker-compose.yml | 0 apps/ani-rss/{2.2.14 => 2.2.15}/envs/default.env | 0 apps/ani-rss/{2.2.14 => 2.2.15}/envs/global.env | 0 apps/ani-rss/{2.2.14 => 2.2.15}/scripts/init.sh | 0 apps/ani-rss/{2.2.14 => 2.2.15}/scripts/uninstall.sh | 0 apps/ani-rss/{2.2.14 => 2.2.15}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{2.2.14 => 2.2.15}/data.yml (100%) rename apps/ani-rss/{2.2.14 => 2.2.15}/docker-compose.yml (100%) rename apps/ani-rss/{2.2.14 => 2.2.15}/envs/default.env (100%) rename apps/ani-rss/{2.2.14 => 2.2.15}/envs/global.env (100%) rename apps/ani-rss/{2.2.14 => 2.2.15}/scripts/init.sh (100%) rename apps/ani-rss/{2.2.14 => 2.2.15}/scripts/uninstall.sh (100%) rename apps/ani-rss/{2.2.14 => 2.2.15}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/2.2.14/data.yml b/apps/ani-rss/2.2.15/data.yml similarity index 100% rename from apps/ani-rss/2.2.14/data.yml rename to apps/ani-rss/2.2.15/data.yml diff --git a/apps/ani-rss/2.2.14/docker-compose.yml b/apps/ani-rss/2.2.15/docker-compose.yml similarity index 100% rename from apps/ani-rss/2.2.14/docker-compose.yml rename to apps/ani-rss/2.2.15/docker-compose.yml diff --git a/apps/ani-rss/2.2.14/envs/default.env b/apps/ani-rss/2.2.15/envs/default.env similarity index 100% rename from apps/ani-rss/2.2.14/envs/default.env rename to apps/ani-rss/2.2.15/envs/default.env diff --git a/apps/ani-rss/2.2.14/envs/global.env b/apps/ani-rss/2.2.15/envs/global.env similarity index 100% rename from apps/ani-rss/2.2.14/envs/global.env rename to apps/ani-rss/2.2.15/envs/global.env diff --git a/apps/ani-rss/2.2.14/scripts/init.sh b/apps/ani-rss/2.2.15/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.2.14/scripts/init.sh rename to apps/ani-rss/2.2.15/scripts/init.sh diff --git a/apps/ani-rss/2.2.14/scripts/uninstall.sh b/apps/ani-rss/2.2.15/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.2.14/scripts/uninstall.sh rename to apps/ani-rss/2.2.15/scripts/uninstall.sh diff --git a/apps/ani-rss/2.2.14/scripts/upgrade.sh b/apps/ani-rss/2.2.15/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.2.14/scripts/upgrade.sh rename to apps/ani-rss/2.2.15/scripts/upgrade.sh From 8d4bfed90db165acd8ce5d53113fb81287b071a6 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 11 Oct 2025 21:16:24 +0000 Subject: [PATCH 094/262] Processed apps directory via GitHub Actions --- appstore/ani-rss/{2.2.14 => 2.2.15}/.env | 0 appstore/ani-rss/{2.2.14 => 2.2.15}/data.yml | 0 appstore/ani-rss/{2.2.14 => 2.2.15}/docker-compose.yml | 2 +- appstore/ani-rss/{2.2.14 => 2.2.15}/envs/default.env | 0 appstore/ani-rss/{2.2.14 => 2.2.15}/envs/global.env | 0 appstore/ani-rss/{2.2.14 => 2.2.15}/scripts/init.sh | 0 appstore/ani-rss/{2.2.14 => 2.2.15}/scripts/uninstall.sh | 0 appstore/ani-rss/{2.2.14 => 2.2.15}/scripts/upgrade.sh | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/.env | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/data.yml | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/docker-compose.yml | 2 +- appstore/emby/{4.9.2.2 => 4.9.2.3}/envs/default.env | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/envs/global.env | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/scripts/init.sh | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/scripts/uninstall.sh | 0 appstore/emby/{4.9.2.2 => 4.9.2.3}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 2 +- dockge/{emby_4_9_2_2 => emby_4_9_2_3}/.env | 0 dockge/{emby_4_9_2_2 => emby_4_9_2_3}/docker-compose.yml | 2 +- dockge/{emby_4_9_2_2 => emby_4_9_2_3}/envs/default.env | 0 dockge/{emby_4_9_2_2 => emby_4_9_2_3}/envs/global.env | 0 21 files changed, 4 insertions(+), 4 deletions(-) rename appstore/ani-rss/{2.2.14 => 2.2.15}/.env (100%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/data.yml (100%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/docker-compose.yml (95%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/envs/default.env (100%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/envs/global.env (100%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/scripts/init.sh (100%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.2.14 => 2.2.15}/scripts/upgrade.sh (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/.env (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/data.yml (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/docker-compose.yml (96%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/envs/default.env (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/envs/global.env (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/scripts/init.sh (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/scripts/uninstall.sh (100%) rename appstore/emby/{4.9.2.2 => 4.9.2.3}/scripts/upgrade.sh (100%) rename dockge/{emby_4_9_2_2 => emby_4_9_2_3}/.env (100%) rename dockge/{emby_4_9_2_2 => emby_4_9_2_3}/docker-compose.yml (96%) rename dockge/{emby_4_9_2_2 => emby_4_9_2_3}/envs/default.env (100%) rename dockge/{emby_4_9_2_2 => emby_4_9_2_3}/envs/global.env (100%) diff --git a/appstore/ani-rss/2.2.14/.env b/appstore/ani-rss/2.2.15/.env similarity index 100% rename from appstore/ani-rss/2.2.14/.env rename to appstore/ani-rss/2.2.15/.env diff --git a/appstore/ani-rss/2.2.14/data.yml b/appstore/ani-rss/2.2.15/data.yml similarity index 100% rename from appstore/ani-rss/2.2.14/data.yml rename to appstore/ani-rss/2.2.15/data.yml diff --git a/appstore/ani-rss/2.2.14/docker-compose.yml b/appstore/ani-rss/2.2.15/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.2.14/docker-compose.yml rename to appstore/ani-rss/2.2.15/docker-compose.yml index 1b5747174..1b1b8dfaa 100644 --- a/appstore/ani-rss/2.2.14/docker-compose.yml +++ b/appstore/ani-rss/2.2.15/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.14 + image: wushuo894/ani-rss:v2.2.15 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/2.2.14/envs/default.env b/appstore/ani-rss/2.2.15/envs/default.env similarity index 100% rename from appstore/ani-rss/2.2.14/envs/default.env rename to appstore/ani-rss/2.2.15/envs/default.env diff --git a/appstore/ani-rss/2.2.14/envs/global.env b/appstore/ani-rss/2.2.15/envs/global.env similarity index 100% rename from appstore/ani-rss/2.2.14/envs/global.env rename to appstore/ani-rss/2.2.15/envs/global.env diff --git a/appstore/ani-rss/2.2.14/scripts/init.sh b/appstore/ani-rss/2.2.15/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.2.14/scripts/init.sh rename to appstore/ani-rss/2.2.15/scripts/init.sh diff --git a/appstore/ani-rss/2.2.14/scripts/uninstall.sh b/appstore/ani-rss/2.2.15/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.2.14/scripts/uninstall.sh rename to appstore/ani-rss/2.2.15/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.2.14/scripts/upgrade.sh b/appstore/ani-rss/2.2.15/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.2.14/scripts/upgrade.sh rename to appstore/ani-rss/2.2.15/scripts/upgrade.sh diff --git a/appstore/emby/4.9.2.2/.env b/appstore/emby/4.9.2.3/.env similarity index 100% rename from appstore/emby/4.9.2.2/.env rename to appstore/emby/4.9.2.3/.env diff --git a/appstore/emby/4.9.2.2/data.yml b/appstore/emby/4.9.2.3/data.yml similarity index 100% rename from appstore/emby/4.9.2.2/data.yml rename to appstore/emby/4.9.2.3/data.yml diff --git a/appstore/emby/4.9.2.2/docker-compose.yml b/appstore/emby/4.9.2.3/docker-compose.yml similarity index 96% rename from appstore/emby/4.9.2.2/docker-compose.yml rename to appstore/emby/4.9.2.3/docker-compose.yml index fd43b5f8e..91ed00d4e 100644 --- a/appstore/emby/4.9.2.2/docker-compose.yml +++ b/appstore/emby/4.9.2.3/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.2 + image: emby/embyserver:4.9.2.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/emby/4.9.2.2/envs/default.env b/appstore/emby/4.9.2.3/envs/default.env similarity index 100% rename from appstore/emby/4.9.2.2/envs/default.env rename to appstore/emby/4.9.2.3/envs/default.env diff --git a/appstore/emby/4.9.2.2/envs/global.env b/appstore/emby/4.9.2.3/envs/global.env similarity index 100% rename from appstore/emby/4.9.2.2/envs/global.env rename to appstore/emby/4.9.2.3/envs/global.env diff --git a/appstore/emby/4.9.2.2/scripts/init.sh b/appstore/emby/4.9.2.3/scripts/init.sh similarity index 100% rename from appstore/emby/4.9.2.2/scripts/init.sh rename to appstore/emby/4.9.2.3/scripts/init.sh diff --git a/appstore/emby/4.9.2.2/scripts/uninstall.sh b/appstore/emby/4.9.2.3/scripts/uninstall.sh similarity index 100% rename from appstore/emby/4.9.2.2/scripts/uninstall.sh rename to appstore/emby/4.9.2.3/scripts/uninstall.sh diff --git a/appstore/emby/4.9.2.2/scripts/upgrade.sh b/appstore/emby/4.9.2.3/scripts/upgrade.sh similarity index 100% rename from appstore/emby/4.9.2.2/scripts/upgrade.sh rename to appstore/emby/4.9.2.3/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 1b5747174..1b1b8dfaa 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.14 + image: wushuo894/ani-rss:v2.2.15 labels: createdBy: Apps networks: diff --git a/dockge/emby_4_9_2_2/.env b/dockge/emby_4_9_2_3/.env similarity index 100% rename from dockge/emby_4_9_2_2/.env rename to dockge/emby_4_9_2_3/.env diff --git a/dockge/emby_4_9_2_2/docker-compose.yml b/dockge/emby_4_9_2_3/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_2_2/docker-compose.yml rename to dockge/emby_4_9_2_3/docker-compose.yml index fd43b5f8e..91ed00d4e 100644 --- a/dockge/emby_4_9_2_2/docker-compose.yml +++ b/dockge/emby_4_9_2_3/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.2 + image: emby/embyserver:4.9.2.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_2/envs/default.env b/dockge/emby_4_9_2_3/envs/default.env similarity index 100% rename from dockge/emby_4_9_2_2/envs/default.env rename to dockge/emby_4_9_2_3/envs/default.env diff --git a/dockge/emby_4_9_2_2/envs/global.env b/dockge/emby_4_9_2_3/envs/global.env similarity index 100% rename from dockge/emby_4_9_2_2/envs/global.env rename to dockge/emby_4_9_2_3/envs/global.env From 7bd97da6ec0171418f9a76d2b608847cd01f293e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Oct 2025 01:40:04 +0000 Subject: [PATCH 095/262] Update dockurr/macos Docker tag to v2.23 --- apps/macos/2.22/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/macos/2.22/docker-compose.yml b/apps/macos/2.22/docker-compose.yml index 5ae458f8e..ff579d35c 100644 --- a/apps/macos/2.22/docker-compose.yml +++ b/apps/macos/2.22/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: windows: - image: dockurr/macos:2.22 + image: dockurr/macos:2.23 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 09e6003fb5971de2d5827a0a1270bc3e607faf61 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 12 Oct 2025 01:40:14 +0000 Subject: [PATCH 096/262] Update app version [skip ci] --- apps/macos/{2.22 => 2.23}/data.yml | 0 apps/macos/{2.22 => 2.23}/docker-compose.yml | 0 apps/macos/{2.22 => 2.23}/envs/default.env | 0 apps/macos/{2.22 => 2.23}/envs/global.env | 0 apps/macos/{2.22 => 2.23}/scripts/init.sh | 0 apps/macos/{2.22 => 2.23}/scripts/uninstall.sh | 0 apps/macos/{2.22 => 2.23}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/macos/{2.22 => 2.23}/data.yml (100%) rename apps/macos/{2.22 => 2.23}/docker-compose.yml (100%) rename apps/macos/{2.22 => 2.23}/envs/default.env (100%) rename apps/macos/{2.22 => 2.23}/envs/global.env (100%) rename apps/macos/{2.22 => 2.23}/scripts/init.sh (100%) rename apps/macos/{2.22 => 2.23}/scripts/uninstall.sh (100%) rename apps/macos/{2.22 => 2.23}/scripts/upgrade.sh (100%) diff --git a/apps/macos/2.22/data.yml b/apps/macos/2.23/data.yml similarity index 100% rename from apps/macos/2.22/data.yml rename to apps/macos/2.23/data.yml diff --git a/apps/macos/2.22/docker-compose.yml b/apps/macos/2.23/docker-compose.yml similarity index 100% rename from apps/macos/2.22/docker-compose.yml rename to apps/macos/2.23/docker-compose.yml diff --git a/apps/macos/2.22/envs/default.env b/apps/macos/2.23/envs/default.env similarity index 100% rename from apps/macos/2.22/envs/default.env rename to apps/macos/2.23/envs/default.env diff --git a/apps/macos/2.22/envs/global.env b/apps/macos/2.23/envs/global.env similarity index 100% rename from apps/macos/2.22/envs/global.env rename to apps/macos/2.23/envs/global.env diff --git a/apps/macos/2.22/scripts/init.sh b/apps/macos/2.23/scripts/init.sh similarity index 100% rename from apps/macos/2.22/scripts/init.sh rename to apps/macos/2.23/scripts/init.sh diff --git a/apps/macos/2.22/scripts/uninstall.sh b/apps/macos/2.23/scripts/uninstall.sh similarity index 100% rename from apps/macos/2.22/scripts/uninstall.sh rename to apps/macos/2.23/scripts/uninstall.sh diff --git a/apps/macos/2.22/scripts/upgrade.sh b/apps/macos/2.23/scripts/upgrade.sh similarity index 100% rename from apps/macos/2.22/scripts/upgrade.sh rename to apps/macos/2.23/scripts/upgrade.sh From e4f6f8326353655dc28345c280a34dfbdb93157a Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sun, 12 Oct 2025 01:43:08 +0000 Subject: [PATCH 097/262] Processed apps directory via GitHub Actions --- appstore/macos/{2.22 => 2.23}/.env | 0 appstore/macos/{2.22 => 2.23}/data.yml | 0 appstore/macos/{2.22 => 2.23}/docker-compose.yml | 2 +- appstore/macos/{2.22 => 2.23}/envs/default.env | 0 appstore/macos/{2.22 => 2.23}/envs/global.env | 0 appstore/macos/{2.22 => 2.23}/scripts/init.sh | 0 appstore/macos/{2.22 => 2.23}/scripts/uninstall.sh | 0 appstore/macos/{2.22 => 2.23}/scripts/upgrade.sh | 0 dockge/macos/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/macos/{2.22 => 2.23}/.env (100%) rename appstore/macos/{2.22 => 2.23}/data.yml (100%) rename appstore/macos/{2.22 => 2.23}/docker-compose.yml (95%) rename appstore/macos/{2.22 => 2.23}/envs/default.env (100%) rename appstore/macos/{2.22 => 2.23}/envs/global.env (100%) rename appstore/macos/{2.22 => 2.23}/scripts/init.sh (100%) rename appstore/macos/{2.22 => 2.23}/scripts/uninstall.sh (100%) rename appstore/macos/{2.22 => 2.23}/scripts/upgrade.sh (100%) diff --git a/appstore/macos/2.22/.env b/appstore/macos/2.23/.env similarity index 100% rename from appstore/macos/2.22/.env rename to appstore/macos/2.23/.env diff --git a/appstore/macos/2.22/data.yml b/appstore/macos/2.23/data.yml similarity index 100% rename from appstore/macos/2.22/data.yml rename to appstore/macos/2.23/data.yml diff --git a/appstore/macos/2.22/docker-compose.yml b/appstore/macos/2.23/docker-compose.yml similarity index 95% rename from appstore/macos/2.22/docker-compose.yml rename to appstore/macos/2.23/docker-compose.yml index e612d8c4a..254e7a38c 100644 --- a/appstore/macos/2.22/docker-compose.yml +++ b/appstore/macos/2.23/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - VERSION=${VERSION} - image: dockurr/macos:2.22 + image: dockurr/macos:2.23 labels: createdBy: Apps networks: diff --git a/appstore/macos/2.22/envs/default.env b/appstore/macos/2.23/envs/default.env similarity index 100% rename from appstore/macos/2.22/envs/default.env rename to appstore/macos/2.23/envs/default.env diff --git a/appstore/macos/2.22/envs/global.env b/appstore/macos/2.23/envs/global.env similarity index 100% rename from appstore/macos/2.22/envs/global.env rename to appstore/macos/2.23/envs/global.env diff --git a/appstore/macos/2.22/scripts/init.sh b/appstore/macos/2.23/scripts/init.sh similarity index 100% rename from appstore/macos/2.22/scripts/init.sh rename to appstore/macos/2.23/scripts/init.sh diff --git a/appstore/macos/2.22/scripts/uninstall.sh b/appstore/macos/2.23/scripts/uninstall.sh similarity index 100% rename from appstore/macos/2.22/scripts/uninstall.sh rename to appstore/macos/2.23/scripts/uninstall.sh diff --git a/appstore/macos/2.22/scripts/upgrade.sh b/appstore/macos/2.23/scripts/upgrade.sh similarity index 100% rename from appstore/macos/2.22/scripts/upgrade.sh rename to appstore/macos/2.23/scripts/upgrade.sh diff --git a/dockge/macos/docker-compose.yml b/dockge/macos/docker-compose.yml index e612d8c4a..254e7a38c 100644 --- a/dockge/macos/docker-compose.yml +++ b/dockge/macos/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - VERSION=${VERSION} - image: dockurr/macos:2.22 + image: dockurr/macos:2.23 labels: createdBy: Apps networks: From 477d3b8f93ee8311c51467d325f91340feec8564 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:38:59 +0000 Subject: [PATCH 098/262] Update soulter/astrbot Docker tag to v4.3.3 --- apps/astrbot-napcat/4.8.119/docker-compose.yml | 2 +- apps/astrbot/4.3.2/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/astrbot-napcat/4.8.119/docker-compose.yml b/apps/astrbot-napcat/4.8.119/docker-compose.yml index 1d4d635c6..0c880128a 100644 --- a/apps/astrbot-napcat/4.8.119/docker-compose.yml +++ b/apps/astrbot-napcat/4.8.119/docker-compose.yml @@ -24,7 +24,7 @@ services: - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} astrbot: - image: soulter/astrbot:v4.3.2 + image: soulter/astrbot:v4.3.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/astrbot/4.3.2/docker-compose.yml b/apps/astrbot/4.3.2/docker-compose.yml index ecdfb387c..3249beddb 100644 --- a/apps/astrbot/4.3.2/docker-compose.yml +++ b/apps/astrbot/4.3.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: astrbot: - image: soulter/astrbot:v4.3.2 + image: soulter/astrbot:v4.3.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From c9adbe62cfe7f166d134eafde087d1618ff777d7 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 12 Oct 2025 05:39:10 +0000 Subject: [PATCH 099/262] Update app version [skip ci] --- apps/astrbot/{4.3.2 => 4.3.3}/data.yml | 0 apps/astrbot/{4.3.2 => 4.3.3}/docker-compose.yml | 0 apps/astrbot/{4.3.2 => 4.3.3}/envs/default.env | 0 apps/astrbot/{4.3.2 => 4.3.3}/envs/global.env | 0 apps/astrbot/{4.3.2 => 4.3.3}/scripts/init.sh | 0 apps/astrbot/{4.3.2 => 4.3.3}/scripts/uninstall.sh | 0 apps/astrbot/{4.3.2 => 4.3.3}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/astrbot/{4.3.2 => 4.3.3}/data.yml (100%) rename apps/astrbot/{4.3.2 => 4.3.3}/docker-compose.yml (100%) rename apps/astrbot/{4.3.2 => 4.3.3}/envs/default.env (100%) rename apps/astrbot/{4.3.2 => 4.3.3}/envs/global.env (100%) rename apps/astrbot/{4.3.2 => 4.3.3}/scripts/init.sh (100%) rename apps/astrbot/{4.3.2 => 4.3.3}/scripts/uninstall.sh (100%) rename apps/astrbot/{4.3.2 => 4.3.3}/scripts/upgrade.sh (100%) diff --git a/apps/astrbot/4.3.2/data.yml b/apps/astrbot/4.3.3/data.yml similarity index 100% rename from apps/astrbot/4.3.2/data.yml rename to apps/astrbot/4.3.3/data.yml diff --git a/apps/astrbot/4.3.2/docker-compose.yml b/apps/astrbot/4.3.3/docker-compose.yml similarity index 100% rename from apps/astrbot/4.3.2/docker-compose.yml rename to apps/astrbot/4.3.3/docker-compose.yml diff --git a/apps/astrbot/4.3.2/envs/default.env b/apps/astrbot/4.3.3/envs/default.env similarity index 100% rename from apps/astrbot/4.3.2/envs/default.env rename to apps/astrbot/4.3.3/envs/default.env diff --git a/apps/astrbot/4.3.2/envs/global.env b/apps/astrbot/4.3.3/envs/global.env similarity index 100% rename from apps/astrbot/4.3.2/envs/global.env rename to apps/astrbot/4.3.3/envs/global.env diff --git a/apps/astrbot/4.3.2/scripts/init.sh b/apps/astrbot/4.3.3/scripts/init.sh similarity index 100% rename from apps/astrbot/4.3.2/scripts/init.sh rename to apps/astrbot/4.3.3/scripts/init.sh diff --git a/apps/astrbot/4.3.2/scripts/uninstall.sh b/apps/astrbot/4.3.3/scripts/uninstall.sh similarity index 100% rename from apps/astrbot/4.3.2/scripts/uninstall.sh rename to apps/astrbot/4.3.3/scripts/uninstall.sh diff --git a/apps/astrbot/4.3.2/scripts/upgrade.sh b/apps/astrbot/4.3.3/scripts/upgrade.sh similarity index 100% rename from apps/astrbot/4.3.2/scripts/upgrade.sh rename to apps/astrbot/4.3.3/scripts/upgrade.sh From ed9bc534c5ec8f4d20c652afbee0bbbb5f17773a Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sun, 12 Oct 2025 06:28:19 +0000 Subject: [PATCH 100/262] Processed apps directory via GitHub Actions --- appstore/astrbot-napcat/4.8.119/docker-compose.yml | 2 +- appstore/astrbot/{4.3.2 => 4.3.3}/.env | 0 appstore/astrbot/{4.3.2 => 4.3.3}/data.yml | 0 appstore/astrbot/{4.3.2 => 4.3.3}/docker-compose.yml | 2 +- appstore/astrbot/{4.3.2 => 4.3.3}/envs/default.env | 0 appstore/astrbot/{4.3.2 => 4.3.3}/envs/global.env | 0 appstore/astrbot/{4.3.2 => 4.3.3}/scripts/init.sh | 0 appstore/astrbot/{4.3.2 => 4.3.3}/scripts/uninstall.sh | 0 appstore/astrbot/{4.3.2 => 4.3.3}/scripts/upgrade.sh | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- dockge/astrbot/docker-compose.yml | 2 +- 11 files changed, 4 insertions(+), 4 deletions(-) rename appstore/astrbot/{4.3.2 => 4.3.3}/.env (100%) rename appstore/astrbot/{4.3.2 => 4.3.3}/data.yml (100%) rename appstore/astrbot/{4.3.2 => 4.3.3}/docker-compose.yml (94%) rename appstore/astrbot/{4.3.2 => 4.3.3}/envs/default.env (100%) rename appstore/astrbot/{4.3.2 => 4.3.3}/envs/global.env (100%) rename appstore/astrbot/{4.3.2 => 4.3.3}/scripts/init.sh (100%) rename appstore/astrbot/{4.3.2 => 4.3.3}/scripts/uninstall.sh (100%) rename appstore/astrbot/{4.3.2 => 4.3.3}/scripts/upgrade.sh (100%) diff --git a/appstore/astrbot-napcat/4.8.119/docker-compose.yml b/appstore/astrbot-napcat/4.8.119/docker-compose.yml index 6c2786554..e4727ddfa 100644 --- a/appstore/astrbot-napcat/4.8.119/docker-compose.yml +++ b/appstore/astrbot-napcat/4.8.119/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.2 + image: soulter/astrbot:v4.3.3 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.3.2/.env b/appstore/astrbot/4.3.3/.env similarity index 100% rename from appstore/astrbot/4.3.2/.env rename to appstore/astrbot/4.3.3/.env diff --git a/appstore/astrbot/4.3.2/data.yml b/appstore/astrbot/4.3.3/data.yml similarity index 100% rename from appstore/astrbot/4.3.2/data.yml rename to appstore/astrbot/4.3.3/data.yml diff --git a/appstore/astrbot/4.3.2/docker-compose.yml b/appstore/astrbot/4.3.3/docker-compose.yml similarity index 94% rename from appstore/astrbot/4.3.2/docker-compose.yml rename to appstore/astrbot/4.3.3/docker-compose.yml index c3270ebd3..8eda00fe2 100644 --- a/appstore/astrbot/4.3.2/docker-compose.yml +++ b/appstore/astrbot/4.3.3/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.2 + image: soulter/astrbot:v4.3.3 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.3.2/envs/default.env b/appstore/astrbot/4.3.3/envs/default.env similarity index 100% rename from appstore/astrbot/4.3.2/envs/default.env rename to appstore/astrbot/4.3.3/envs/default.env diff --git a/appstore/astrbot/4.3.2/envs/global.env b/appstore/astrbot/4.3.3/envs/global.env similarity index 100% rename from appstore/astrbot/4.3.2/envs/global.env rename to appstore/astrbot/4.3.3/envs/global.env diff --git a/appstore/astrbot/4.3.2/scripts/init.sh b/appstore/astrbot/4.3.3/scripts/init.sh similarity index 100% rename from appstore/astrbot/4.3.2/scripts/init.sh rename to appstore/astrbot/4.3.3/scripts/init.sh diff --git a/appstore/astrbot/4.3.2/scripts/uninstall.sh b/appstore/astrbot/4.3.3/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot/4.3.2/scripts/uninstall.sh rename to appstore/astrbot/4.3.3/scripts/uninstall.sh diff --git a/appstore/astrbot/4.3.2/scripts/upgrade.sh b/appstore/astrbot/4.3.3/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot/4.3.2/scripts/upgrade.sh rename to appstore/astrbot/4.3.3/scripts/upgrade.sh diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index 6c2786554..e4727ddfa 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.2 + image: soulter/astrbot:v4.3.3 labels: createdBy: Apps networks: diff --git a/dockge/astrbot/docker-compose.yml b/dockge/astrbot/docker-compose.yml index c3270ebd3..8eda00fe2 100644 --- a/dockge/astrbot/docker-compose.yml +++ b/dockge/astrbot/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.2 + image: soulter/astrbot:v4.3.3 labels: createdBy: Apps networks: From 8ec4daa902ccf550c36582f20a3879ffd4a978b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Oct 2025 08:29:08 +0000 Subject: [PATCH 101/262] Update qyg2297248353/bili-fetcher-web Docker tag to v1.6.8 --- apps/bili-fetcher/1.6.8/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bili-fetcher/1.6.8/docker-compose.yml b/apps/bili-fetcher/1.6.8/docker-compose.yml index 1a6307df3..9b012ea40 100644 --- a/apps/bili-fetcher/1.6.8/docker-compose.yml +++ b/apps/bili-fetcher/1.6.8/docker-compose.yml @@ -22,7 +22,7 @@ services: - DOCKER_ENV=true bili-fetcher-web: - image: qyg2297248353/bili-fetcher-web:v1.6.7 + image: qyg2297248353/bili-fetcher-web:v1.6.8 depends_on: - bili-fetcher-api container_name: ${CONTAINER_NAME} From 58d64a7ba2f43e3c7462133ffca30d6c003ab6b3 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sun, 12 Oct 2025 09:18:47 +0000 Subject: [PATCH 102/262] Processed apps directory via GitHub Actions --- appstore/bili-fetcher/1.6.8/docker-compose.yml | 2 +- dockge/bili-fetcher/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appstore/bili-fetcher/1.6.8/docker-compose.yml b/appstore/bili-fetcher/1.6.8/docker-compose.yml index d0284297f..af4782f89 100644 --- a/appstore/bili-fetcher/1.6.8/docker-compose.yml +++ b/appstore/bili-fetcher/1.6.8/docker-compose.yml @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.7 + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index d0284297f..af4782f89 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.7 + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: From c9532f5e52b1917e9a9444401fe9d9fccf473e9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Oct 2025 13:56:36 +0000 Subject: [PATCH 103/262] Update anirdev/slink Docker tag to v1.7.3 --- apps/slink/1.7.2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/slink/1.7.2/docker-compose.yml b/apps/slink/1.7.2/docker-compose.yml index b59b2b242..9f992afa6 100644 --- a/apps/slink/1.7.2/docker-compose.yml +++ b/apps/slink/1.7.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: slink: - image: anirdev/slink:v1.7.2 + image: anirdev/slink:v1.7.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 746cf3c481e061e16a32aebffaa26b7177dc2e54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Oct 2025 13:56:41 +0000 Subject: [PATCH 104/262] Update ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server Docker tag to v1.0.6 --- apps/smtp-proxy-server/1.0.5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/smtp-proxy-server/1.0.5/docker-compose.yml b/apps/smtp-proxy-server/1.0.5/docker-compose.yml index 45164e5f1..7e1bbd3a8 100644 --- a/apps/smtp-proxy-server/1.0.5/docker-compose.yml +++ b/apps/smtp-proxy-server/1.0.5/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: smtp_proxy_server: - image: ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server:v1.0.5 + image: ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server:v1.0.6 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 7456f7ddd9c3e00e8955c08756b597c8744467d8 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 12 Oct 2025 13:56:48 +0000 Subject: [PATCH 105/262] Update app version [skip ci] --- apps/slink/{1.7.2 => 1.7.3}/data.yml | 0 apps/slink/{1.7.2 => 1.7.3}/docker-compose.yml | 0 apps/slink/{1.7.2 => 1.7.3}/envs/default.env | 0 apps/slink/{1.7.2 => 1.7.3}/envs/global.env | 0 apps/slink/{1.7.2 => 1.7.3}/scripts/init.sh | 0 apps/slink/{1.7.2 => 1.7.3}/scripts/uninstall.sh | 0 apps/slink/{1.7.2 => 1.7.3}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/slink/{1.7.2 => 1.7.3}/data.yml (100%) rename apps/slink/{1.7.2 => 1.7.3}/docker-compose.yml (100%) rename apps/slink/{1.7.2 => 1.7.3}/envs/default.env (100%) rename apps/slink/{1.7.2 => 1.7.3}/envs/global.env (100%) rename apps/slink/{1.7.2 => 1.7.3}/scripts/init.sh (100%) rename apps/slink/{1.7.2 => 1.7.3}/scripts/uninstall.sh (100%) rename apps/slink/{1.7.2 => 1.7.3}/scripts/upgrade.sh (100%) diff --git a/apps/slink/1.7.2/data.yml b/apps/slink/1.7.3/data.yml similarity index 100% rename from apps/slink/1.7.2/data.yml rename to apps/slink/1.7.3/data.yml diff --git a/apps/slink/1.7.2/docker-compose.yml b/apps/slink/1.7.3/docker-compose.yml similarity index 100% rename from apps/slink/1.7.2/docker-compose.yml rename to apps/slink/1.7.3/docker-compose.yml diff --git a/apps/slink/1.7.2/envs/default.env b/apps/slink/1.7.3/envs/default.env similarity index 100% rename from apps/slink/1.7.2/envs/default.env rename to apps/slink/1.7.3/envs/default.env diff --git a/apps/slink/1.7.2/envs/global.env b/apps/slink/1.7.3/envs/global.env similarity index 100% rename from apps/slink/1.7.2/envs/global.env rename to apps/slink/1.7.3/envs/global.env diff --git a/apps/slink/1.7.2/scripts/init.sh b/apps/slink/1.7.3/scripts/init.sh similarity index 100% rename from apps/slink/1.7.2/scripts/init.sh rename to apps/slink/1.7.3/scripts/init.sh diff --git a/apps/slink/1.7.2/scripts/uninstall.sh b/apps/slink/1.7.3/scripts/uninstall.sh similarity index 100% rename from apps/slink/1.7.2/scripts/uninstall.sh rename to apps/slink/1.7.3/scripts/uninstall.sh diff --git a/apps/slink/1.7.2/scripts/upgrade.sh b/apps/slink/1.7.3/scripts/upgrade.sh similarity index 100% rename from apps/slink/1.7.2/scripts/upgrade.sh rename to apps/slink/1.7.3/scripts/upgrade.sh From 4ea69babde61399d51533f3e9739cb82d1350ad3 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 12 Oct 2025 13:56:50 +0000 Subject: [PATCH 106/262] Update app version [skip ci] --- apps/smtp-proxy-server/{1.0.5 => 1.0.6}/data.yml | 0 apps/smtp-proxy-server/{1.0.5 => 1.0.6}/docker-compose.yml | 0 apps/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/default.env | 0 apps/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/global.env | 0 apps/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/init.sh | 0 apps/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/uninstall.sh | 0 apps/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/data.yml (100%) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/docker-compose.yml (100%) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/default.env (100%) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/global.env (100%) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/init.sh (100%) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/uninstall.sh (100%) rename apps/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/upgrade.sh (100%) diff --git a/apps/smtp-proxy-server/1.0.5/data.yml b/apps/smtp-proxy-server/1.0.6/data.yml similarity index 100% rename from apps/smtp-proxy-server/1.0.5/data.yml rename to apps/smtp-proxy-server/1.0.6/data.yml diff --git a/apps/smtp-proxy-server/1.0.5/docker-compose.yml b/apps/smtp-proxy-server/1.0.6/docker-compose.yml similarity index 100% rename from apps/smtp-proxy-server/1.0.5/docker-compose.yml rename to apps/smtp-proxy-server/1.0.6/docker-compose.yml diff --git a/apps/smtp-proxy-server/1.0.5/envs/default.env b/apps/smtp-proxy-server/1.0.6/envs/default.env similarity index 100% rename from apps/smtp-proxy-server/1.0.5/envs/default.env rename to apps/smtp-proxy-server/1.0.6/envs/default.env diff --git a/apps/smtp-proxy-server/1.0.5/envs/global.env b/apps/smtp-proxy-server/1.0.6/envs/global.env similarity index 100% rename from apps/smtp-proxy-server/1.0.5/envs/global.env rename to apps/smtp-proxy-server/1.0.6/envs/global.env diff --git a/apps/smtp-proxy-server/1.0.5/scripts/init.sh b/apps/smtp-proxy-server/1.0.6/scripts/init.sh similarity index 100% rename from apps/smtp-proxy-server/1.0.5/scripts/init.sh rename to apps/smtp-proxy-server/1.0.6/scripts/init.sh diff --git a/apps/smtp-proxy-server/1.0.5/scripts/uninstall.sh b/apps/smtp-proxy-server/1.0.6/scripts/uninstall.sh similarity index 100% rename from apps/smtp-proxy-server/1.0.5/scripts/uninstall.sh rename to apps/smtp-proxy-server/1.0.6/scripts/uninstall.sh diff --git a/apps/smtp-proxy-server/1.0.5/scripts/upgrade.sh b/apps/smtp-proxy-server/1.0.6/scripts/upgrade.sh similarity index 100% rename from apps/smtp-proxy-server/1.0.5/scripts/upgrade.sh rename to apps/smtp-proxy-server/1.0.6/scripts/upgrade.sh From 1a15ef4ce0ec351c6670a6773349ed2d2defe04c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sun, 12 Oct 2025 15:18:43 +0000 Subject: [PATCH 107/262] Processed apps directory via GitHub Actions --- appstore/slink/{1.7.2 => 1.7.3}/.env | 0 appstore/slink/{1.7.2 => 1.7.3}/data.yml | 0 appstore/slink/{1.7.2 => 1.7.3}/docker-compose.yml | 2 +- appstore/slink/{1.7.2 => 1.7.3}/envs/default.env | 0 appstore/slink/{1.7.2 => 1.7.3}/envs/global.env | 0 appstore/slink/{1.7.2 => 1.7.3}/scripts/init.sh | 0 appstore/slink/{1.7.2 => 1.7.3}/scripts/uninstall.sh | 0 appstore/slink/{1.7.2 => 1.7.3}/scripts/upgrade.sh | 0 appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/.env | 0 appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/data.yml | 0 appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/docker-compose.yml | 2 +- appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/default.env | 0 appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/global.env | 0 appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/init.sh | 0 .../smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/uninstall.sh | 0 appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/upgrade.sh | 0 dockge/slink/docker-compose.yml | 2 +- dockge/smtp-proxy-server/docker-compose.yml | 2 +- 18 files changed, 4 insertions(+), 4 deletions(-) rename appstore/slink/{1.7.2 => 1.7.3}/.env (100%) rename appstore/slink/{1.7.2 => 1.7.3}/data.yml (100%) rename appstore/slink/{1.7.2 => 1.7.3}/docker-compose.yml (94%) rename appstore/slink/{1.7.2 => 1.7.3}/envs/default.env (100%) rename appstore/slink/{1.7.2 => 1.7.3}/envs/global.env (100%) rename appstore/slink/{1.7.2 => 1.7.3}/scripts/init.sh (100%) rename appstore/slink/{1.7.2 => 1.7.3}/scripts/uninstall.sh (100%) rename appstore/slink/{1.7.2 => 1.7.3}/scripts/upgrade.sh (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/.env (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/data.yml (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/docker-compose.yml (96%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/default.env (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/envs/global.env (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/init.sh (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/uninstall.sh (100%) rename appstore/smtp-proxy-server/{1.0.5 => 1.0.6}/scripts/upgrade.sh (100%) diff --git a/appstore/slink/1.7.2/.env b/appstore/slink/1.7.3/.env similarity index 100% rename from appstore/slink/1.7.2/.env rename to appstore/slink/1.7.3/.env diff --git a/appstore/slink/1.7.2/data.yml b/appstore/slink/1.7.3/data.yml similarity index 100% rename from appstore/slink/1.7.2/data.yml rename to appstore/slink/1.7.3/data.yml diff --git a/appstore/slink/1.7.2/docker-compose.yml b/appstore/slink/1.7.3/docker-compose.yml similarity index 94% rename from appstore/slink/1.7.2/docker-compose.yml rename to appstore/slink/1.7.3/docker-compose.yml index b39d28ff7..10ae49d13 100644 --- a/appstore/slink/1.7.2/docker-compose.yml +++ b/appstore/slink/1.7.3/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.7.2 + image: anirdev/slink:v1.7.3 labels: createdBy: Apps networks: diff --git a/appstore/slink/1.7.2/envs/default.env b/appstore/slink/1.7.3/envs/default.env similarity index 100% rename from appstore/slink/1.7.2/envs/default.env rename to appstore/slink/1.7.3/envs/default.env diff --git a/appstore/slink/1.7.2/envs/global.env b/appstore/slink/1.7.3/envs/global.env similarity index 100% rename from appstore/slink/1.7.2/envs/global.env rename to appstore/slink/1.7.3/envs/global.env diff --git a/appstore/slink/1.7.2/scripts/init.sh b/appstore/slink/1.7.3/scripts/init.sh similarity index 100% rename from appstore/slink/1.7.2/scripts/init.sh rename to appstore/slink/1.7.3/scripts/init.sh diff --git a/appstore/slink/1.7.2/scripts/uninstall.sh b/appstore/slink/1.7.3/scripts/uninstall.sh similarity index 100% rename from appstore/slink/1.7.2/scripts/uninstall.sh rename to appstore/slink/1.7.3/scripts/uninstall.sh diff --git a/appstore/slink/1.7.2/scripts/upgrade.sh b/appstore/slink/1.7.3/scripts/upgrade.sh similarity index 100% rename from appstore/slink/1.7.2/scripts/upgrade.sh rename to appstore/slink/1.7.3/scripts/upgrade.sh diff --git a/appstore/smtp-proxy-server/1.0.5/.env b/appstore/smtp-proxy-server/1.0.6/.env similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/.env rename to appstore/smtp-proxy-server/1.0.6/.env diff --git a/appstore/smtp-proxy-server/1.0.5/data.yml b/appstore/smtp-proxy-server/1.0.6/data.yml similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/data.yml rename to appstore/smtp-proxy-server/1.0.6/data.yml diff --git a/appstore/smtp-proxy-server/1.0.5/docker-compose.yml b/appstore/smtp-proxy-server/1.0.6/docker-compose.yml similarity index 96% rename from appstore/smtp-proxy-server/1.0.5/docker-compose.yml rename to appstore/smtp-proxy-server/1.0.6/docker-compose.yml index c6b814efd..7fef4c0bb 100644 --- a/appstore/smtp-proxy-server/1.0.5/docker-compose.yml +++ b/appstore/smtp-proxy-server/1.0.6/docker-compose.yml @@ -12,7 +12,7 @@ services: - proxy_url=${PROXY_URL} - port=${PANEL_APP_PORT_SMTP} - imap_port=${PANEL_APP_PORT_IMAP} - image: ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server:v1.0.5 + image: ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server:v1.0.6 labels: createdBy: Apps networks: diff --git a/appstore/smtp-proxy-server/1.0.5/envs/default.env b/appstore/smtp-proxy-server/1.0.6/envs/default.env similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/envs/default.env rename to appstore/smtp-proxy-server/1.0.6/envs/default.env diff --git a/appstore/smtp-proxy-server/1.0.5/envs/global.env b/appstore/smtp-proxy-server/1.0.6/envs/global.env similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/envs/global.env rename to appstore/smtp-proxy-server/1.0.6/envs/global.env diff --git a/appstore/smtp-proxy-server/1.0.5/scripts/init.sh b/appstore/smtp-proxy-server/1.0.6/scripts/init.sh similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/scripts/init.sh rename to appstore/smtp-proxy-server/1.0.6/scripts/init.sh diff --git a/appstore/smtp-proxy-server/1.0.5/scripts/uninstall.sh b/appstore/smtp-proxy-server/1.0.6/scripts/uninstall.sh similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/scripts/uninstall.sh rename to appstore/smtp-proxy-server/1.0.6/scripts/uninstall.sh diff --git a/appstore/smtp-proxy-server/1.0.5/scripts/upgrade.sh b/appstore/smtp-proxy-server/1.0.6/scripts/upgrade.sh similarity index 100% rename from appstore/smtp-proxy-server/1.0.5/scripts/upgrade.sh rename to appstore/smtp-proxy-server/1.0.6/scripts/upgrade.sh diff --git a/dockge/slink/docker-compose.yml b/dockge/slink/docker-compose.yml index b39d28ff7..10ae49d13 100644 --- a/dockge/slink/docker-compose.yml +++ b/dockge/slink/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.7.2 + image: anirdev/slink:v1.7.3 labels: createdBy: Apps networks: diff --git a/dockge/smtp-proxy-server/docker-compose.yml b/dockge/smtp-proxy-server/docker-compose.yml index c6b814efd..7fef4c0bb 100644 --- a/dockge/smtp-proxy-server/docker-compose.yml +++ b/dockge/smtp-proxy-server/docker-compose.yml @@ -12,7 +12,7 @@ services: - proxy_url=${PROXY_URL} - port=${PANEL_APP_PORT_SMTP} - imap_port=${PANEL_APP_PORT_IMAP} - image: ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server:v1.0.5 + image: ghcr.io/dreamhunter2333/cloudflare_temp_email/smtp_proxy_server:v1.0.6 labels: createdBy: Apps networks: From 22449e7010ab30b5ea23445fa48601a2ebffa2cc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Oct 2025 15:21:49 +0000 Subject: [PATCH 108/262] Update wushuo894/ani-rss Docker tag to v2.2.16 --- apps/ani-rss/2.2.15/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/2.2.15/docker-compose.yml b/apps/ani-rss/2.2.15/docker-compose.yml index 8992e8d01..7df96bf81 100644 --- a/apps/ani-rss/2.2.15/docker-compose.yml +++ b/apps/ani-rss/2.2.15/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.2.15 + image: wushuo894/ani-rss:v2.2.16 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 72ecf4305aec2a28fa23c76e8b15899333ac02a8 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 12 Oct 2025 15:22:00 +0000 Subject: [PATCH 109/262] Update app version [skip ci] --- apps/ani-rss/{2.2.15 => 2.2.16}/data.yml | 0 apps/ani-rss/{2.2.15 => 2.2.16}/docker-compose.yml | 0 apps/ani-rss/{2.2.15 => 2.2.16}/envs/default.env | 0 apps/ani-rss/{2.2.15 => 2.2.16}/envs/global.env | 0 apps/ani-rss/{2.2.15 => 2.2.16}/scripts/init.sh | 0 apps/ani-rss/{2.2.15 => 2.2.16}/scripts/uninstall.sh | 0 apps/ani-rss/{2.2.15 => 2.2.16}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{2.2.15 => 2.2.16}/data.yml (100%) rename apps/ani-rss/{2.2.15 => 2.2.16}/docker-compose.yml (100%) rename apps/ani-rss/{2.2.15 => 2.2.16}/envs/default.env (100%) rename apps/ani-rss/{2.2.15 => 2.2.16}/envs/global.env (100%) rename apps/ani-rss/{2.2.15 => 2.2.16}/scripts/init.sh (100%) rename apps/ani-rss/{2.2.15 => 2.2.16}/scripts/uninstall.sh (100%) rename apps/ani-rss/{2.2.15 => 2.2.16}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/2.2.15/data.yml b/apps/ani-rss/2.2.16/data.yml similarity index 100% rename from apps/ani-rss/2.2.15/data.yml rename to apps/ani-rss/2.2.16/data.yml diff --git a/apps/ani-rss/2.2.15/docker-compose.yml b/apps/ani-rss/2.2.16/docker-compose.yml similarity index 100% rename from apps/ani-rss/2.2.15/docker-compose.yml rename to apps/ani-rss/2.2.16/docker-compose.yml diff --git a/apps/ani-rss/2.2.15/envs/default.env b/apps/ani-rss/2.2.16/envs/default.env similarity index 100% rename from apps/ani-rss/2.2.15/envs/default.env rename to apps/ani-rss/2.2.16/envs/default.env diff --git a/apps/ani-rss/2.2.15/envs/global.env b/apps/ani-rss/2.2.16/envs/global.env similarity index 100% rename from apps/ani-rss/2.2.15/envs/global.env rename to apps/ani-rss/2.2.16/envs/global.env diff --git a/apps/ani-rss/2.2.15/scripts/init.sh b/apps/ani-rss/2.2.16/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.2.15/scripts/init.sh rename to apps/ani-rss/2.2.16/scripts/init.sh diff --git a/apps/ani-rss/2.2.15/scripts/uninstall.sh b/apps/ani-rss/2.2.16/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.2.15/scripts/uninstall.sh rename to apps/ani-rss/2.2.16/scripts/uninstall.sh diff --git a/apps/ani-rss/2.2.15/scripts/upgrade.sh b/apps/ani-rss/2.2.16/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.2.15/scripts/upgrade.sh rename to apps/ani-rss/2.2.16/scripts/upgrade.sh From 52c675115ad63283e207526a614f2fa7bb48478a Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sun, 12 Oct 2025 18:26:36 +0000 Subject: [PATCH 110/262] Processed apps directory via GitHub Actions --- appstore/ani-rss/{2.2.15 => 2.2.16}/.env | 0 appstore/ani-rss/{2.2.15 => 2.2.16}/data.yml | 0 appstore/ani-rss/{2.2.15 => 2.2.16}/docker-compose.yml | 2 +- appstore/ani-rss/{2.2.15 => 2.2.16}/envs/default.env | 0 appstore/ani-rss/{2.2.15 => 2.2.16}/envs/global.env | 0 appstore/ani-rss/{2.2.15 => 2.2.16}/scripts/init.sh | 0 appstore/ani-rss/{2.2.15 => 2.2.16}/scripts/uninstall.sh | 0 appstore/ani-rss/{2.2.15 => 2.2.16}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/ani-rss/{2.2.15 => 2.2.16}/.env (100%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/data.yml (100%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/docker-compose.yml (95%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/envs/default.env (100%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/envs/global.env (100%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/scripts/init.sh (100%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.2.15 => 2.2.16}/scripts/upgrade.sh (100%) diff --git a/appstore/ani-rss/2.2.15/.env b/appstore/ani-rss/2.2.16/.env similarity index 100% rename from appstore/ani-rss/2.2.15/.env rename to appstore/ani-rss/2.2.16/.env diff --git a/appstore/ani-rss/2.2.15/data.yml b/appstore/ani-rss/2.2.16/data.yml similarity index 100% rename from appstore/ani-rss/2.2.15/data.yml rename to appstore/ani-rss/2.2.16/data.yml diff --git a/appstore/ani-rss/2.2.15/docker-compose.yml b/appstore/ani-rss/2.2.16/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.2.15/docker-compose.yml rename to appstore/ani-rss/2.2.16/docker-compose.yml index 1b1b8dfaa..3b0aa3cd5 100644 --- a/appstore/ani-rss/2.2.15/docker-compose.yml +++ b/appstore/ani-rss/2.2.16/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.15 + image: wushuo894/ani-rss:v2.2.16 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/2.2.15/envs/default.env b/appstore/ani-rss/2.2.16/envs/default.env similarity index 100% rename from appstore/ani-rss/2.2.15/envs/default.env rename to appstore/ani-rss/2.2.16/envs/default.env diff --git a/appstore/ani-rss/2.2.15/envs/global.env b/appstore/ani-rss/2.2.16/envs/global.env similarity index 100% rename from appstore/ani-rss/2.2.15/envs/global.env rename to appstore/ani-rss/2.2.16/envs/global.env diff --git a/appstore/ani-rss/2.2.15/scripts/init.sh b/appstore/ani-rss/2.2.16/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.2.15/scripts/init.sh rename to appstore/ani-rss/2.2.16/scripts/init.sh diff --git a/appstore/ani-rss/2.2.15/scripts/uninstall.sh b/appstore/ani-rss/2.2.16/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.2.15/scripts/uninstall.sh rename to appstore/ani-rss/2.2.16/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.2.15/scripts/upgrade.sh b/appstore/ani-rss/2.2.16/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.2.15/scripts/upgrade.sh rename to appstore/ani-rss/2.2.16/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 1b1b8dfaa..3b0aa3cd5 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.15 + image: wushuo894/ani-rss:v2.2.16 labels: createdBy: Apps networks: From 5ca5cf9ef8031f043ceec6ddccce070b8d4b18ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 04:27:49 +0000 Subject: [PATCH 111/262] Update hamster1963/nezha-dash Docker tag to v2.12.0 --- apps/nezha-dash/2.11.2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha-dash/2.11.2/docker-compose.yml b/apps/nezha-dash/2.11.2/docker-compose.yml index 4c43175e3..aba7c9766 100644 --- a/apps/nezha-dash/2.11.2/docker-compose.yml +++ b/apps/nezha-dash/2.11.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha-dash: - image: hamster1963/nezha-dash:v2.11.2 + image: hamster1963/nezha-dash:v2.12.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 5f38bef0ffe8a79f6fab45203b0bc21d816f2dd9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 04:28:00 +0000 Subject: [PATCH 112/262] Update app version [skip ci] --- apps/nezha-dash/{2.11.2 => 2.12.0}/data.yml | 0 apps/nezha-dash/{2.11.2 => 2.12.0}/docker-compose.yml | 0 apps/nezha-dash/{2.11.2 => 2.12.0}/envs/default.env | 0 apps/nezha-dash/{2.11.2 => 2.12.0}/envs/global.env | 0 apps/nezha-dash/{2.11.2 => 2.12.0}/scripts/init.sh | 0 apps/nezha-dash/{2.11.2 => 2.12.0}/scripts/uninstall.sh | 0 apps/nezha-dash/{2.11.2 => 2.12.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha-dash/{2.11.2 => 2.12.0}/data.yml (100%) rename apps/nezha-dash/{2.11.2 => 2.12.0}/docker-compose.yml (100%) rename apps/nezha-dash/{2.11.2 => 2.12.0}/envs/default.env (100%) rename apps/nezha-dash/{2.11.2 => 2.12.0}/envs/global.env (100%) rename apps/nezha-dash/{2.11.2 => 2.12.0}/scripts/init.sh (100%) rename apps/nezha-dash/{2.11.2 => 2.12.0}/scripts/uninstall.sh (100%) rename apps/nezha-dash/{2.11.2 => 2.12.0}/scripts/upgrade.sh (100%) diff --git a/apps/nezha-dash/2.11.2/data.yml b/apps/nezha-dash/2.12.0/data.yml similarity index 100% rename from apps/nezha-dash/2.11.2/data.yml rename to apps/nezha-dash/2.12.0/data.yml diff --git a/apps/nezha-dash/2.11.2/docker-compose.yml b/apps/nezha-dash/2.12.0/docker-compose.yml similarity index 100% rename from apps/nezha-dash/2.11.2/docker-compose.yml rename to apps/nezha-dash/2.12.0/docker-compose.yml diff --git a/apps/nezha-dash/2.11.2/envs/default.env b/apps/nezha-dash/2.12.0/envs/default.env similarity index 100% rename from apps/nezha-dash/2.11.2/envs/default.env rename to apps/nezha-dash/2.12.0/envs/default.env diff --git a/apps/nezha-dash/2.11.2/envs/global.env b/apps/nezha-dash/2.12.0/envs/global.env similarity index 100% rename from apps/nezha-dash/2.11.2/envs/global.env rename to apps/nezha-dash/2.12.0/envs/global.env diff --git a/apps/nezha-dash/2.11.2/scripts/init.sh b/apps/nezha-dash/2.12.0/scripts/init.sh similarity index 100% rename from apps/nezha-dash/2.11.2/scripts/init.sh rename to apps/nezha-dash/2.12.0/scripts/init.sh diff --git a/apps/nezha-dash/2.11.2/scripts/uninstall.sh b/apps/nezha-dash/2.12.0/scripts/uninstall.sh similarity index 100% rename from apps/nezha-dash/2.11.2/scripts/uninstall.sh rename to apps/nezha-dash/2.12.0/scripts/uninstall.sh diff --git a/apps/nezha-dash/2.11.2/scripts/upgrade.sh b/apps/nezha-dash/2.12.0/scripts/upgrade.sh similarity index 100% rename from apps/nezha-dash/2.11.2/scripts/upgrade.sh rename to apps/nezha-dash/2.12.0/scripts/upgrade.sh From 20f1ae0f3d2d544d7d4f22ad86e5cd135e00b436 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Mon, 13 Oct 2025 06:33:48 +0000 Subject: [PATCH 113/262] Processed apps directory via GitHub Actions --- appstore/nezha-dash/{2.11.2 => 2.12.0}/.env | 0 appstore/nezha-dash/{2.11.2 => 2.12.0}/data.yml | 0 appstore/nezha-dash/{2.11.2 => 2.12.0}/docker-compose.yml | 2 +- appstore/nezha-dash/{2.11.2 => 2.12.0}/envs/default.env | 0 appstore/nezha-dash/{2.11.2 => 2.12.0}/envs/global.env | 0 appstore/nezha-dash/{2.11.2 => 2.12.0}/scripts/init.sh | 0 appstore/nezha-dash/{2.11.2 => 2.12.0}/scripts/uninstall.sh | 0 appstore/nezha-dash/{2.11.2 => 2.12.0}/scripts/upgrade.sh | 0 dockge/nezha-dash/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/.env (100%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/data.yml (100%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/docker-compose.yml (94%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/envs/default.env (100%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/envs/global.env (100%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/scripts/init.sh (100%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/scripts/uninstall.sh (100%) rename appstore/nezha-dash/{2.11.2 => 2.12.0}/scripts/upgrade.sh (100%) diff --git a/appstore/nezha-dash/2.11.2/.env b/appstore/nezha-dash/2.12.0/.env similarity index 100% rename from appstore/nezha-dash/2.11.2/.env rename to appstore/nezha-dash/2.12.0/.env diff --git a/appstore/nezha-dash/2.11.2/data.yml b/appstore/nezha-dash/2.12.0/data.yml similarity index 100% rename from appstore/nezha-dash/2.11.2/data.yml rename to appstore/nezha-dash/2.12.0/data.yml diff --git a/appstore/nezha-dash/2.11.2/docker-compose.yml b/appstore/nezha-dash/2.12.0/docker-compose.yml similarity index 94% rename from appstore/nezha-dash/2.11.2/docker-compose.yml rename to appstore/nezha-dash/2.12.0/docker-compose.yml index bce51082b..1da401079 100644 --- a/appstore/nezha-dash/2.11.2/docker-compose.yml +++ b/appstore/nezha-dash/2.12.0/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.2 + image: hamster1963/nezha-dash:v2.12.0 labels: createdBy: Apps networks: diff --git a/appstore/nezha-dash/2.11.2/envs/default.env b/appstore/nezha-dash/2.12.0/envs/default.env similarity index 100% rename from appstore/nezha-dash/2.11.2/envs/default.env rename to appstore/nezha-dash/2.12.0/envs/default.env diff --git a/appstore/nezha-dash/2.11.2/envs/global.env b/appstore/nezha-dash/2.12.0/envs/global.env similarity index 100% rename from appstore/nezha-dash/2.11.2/envs/global.env rename to appstore/nezha-dash/2.12.0/envs/global.env diff --git a/appstore/nezha-dash/2.11.2/scripts/init.sh b/appstore/nezha-dash/2.12.0/scripts/init.sh similarity index 100% rename from appstore/nezha-dash/2.11.2/scripts/init.sh rename to appstore/nezha-dash/2.12.0/scripts/init.sh diff --git a/appstore/nezha-dash/2.11.2/scripts/uninstall.sh b/appstore/nezha-dash/2.12.0/scripts/uninstall.sh similarity index 100% rename from appstore/nezha-dash/2.11.2/scripts/uninstall.sh rename to appstore/nezha-dash/2.12.0/scripts/uninstall.sh diff --git a/appstore/nezha-dash/2.11.2/scripts/upgrade.sh b/appstore/nezha-dash/2.12.0/scripts/upgrade.sh similarity index 100% rename from appstore/nezha-dash/2.11.2/scripts/upgrade.sh rename to appstore/nezha-dash/2.12.0/scripts/upgrade.sh diff --git a/dockge/nezha-dash/docker-compose.yml b/dockge/nezha-dash/docker-compose.yml index bce51082b..1da401079 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.2 + image: hamster1963/nezha-dash:v2.12.0 labels: createdBy: Apps networks: From 8c78c2ab22feb2b7f1273a7086c973bfae697a57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 13:59:59 +0000 Subject: [PATCH 114/262] Update johannesjo/super-productivity Docker tag to v15.2.12 --- apps/super-productivity/15.2.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/super-productivity/15.2.0/docker-compose.yml b/apps/super-productivity/15.2.0/docker-compose.yml index df3395e67..53ead8930 100644 --- a/apps/super-productivity/15.2.0/docker-compose.yml +++ b/apps/super-productivity/15.2.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: super-productivity: - image: johannesjo/super-productivity:v15.2.0 + image: johannesjo/super-productivity:v15.2.12 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 9f8232f5ffae7eaac0682f5701425c968cf7da23 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 14:00:09 +0000 Subject: [PATCH 115/262] Update app version [skip ci] --- apps/super-productivity/{15.2.0 => 15.2.12}/conf/webdav.yaml | 0 apps/super-productivity/{15.2.0 => 15.2.12}/data.yml | 0 apps/super-productivity/{15.2.0 => 15.2.12}/docker-compose.yml | 0 apps/super-productivity/{15.2.0 => 15.2.12}/envs/default.env | 0 apps/super-productivity/{15.2.0 => 15.2.12}/envs/global.env | 0 apps/super-productivity/{15.2.0 => 15.2.12}/scripts/init.sh | 0 apps/super-productivity/{15.2.0 => 15.2.12}/scripts/uninstall.sh | 0 apps/super-productivity/{15.2.0 => 15.2.12}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/super-productivity/{15.2.0 => 15.2.12}/conf/webdav.yaml (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/data.yml (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/docker-compose.yml (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/envs/default.env (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/envs/global.env (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/scripts/init.sh (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/scripts/uninstall.sh (100%) rename apps/super-productivity/{15.2.0 => 15.2.12}/scripts/upgrade.sh (100%) diff --git a/apps/super-productivity/15.2.0/conf/webdav.yaml b/apps/super-productivity/15.2.12/conf/webdav.yaml similarity index 100% rename from apps/super-productivity/15.2.0/conf/webdav.yaml rename to apps/super-productivity/15.2.12/conf/webdav.yaml diff --git a/apps/super-productivity/15.2.0/data.yml b/apps/super-productivity/15.2.12/data.yml similarity index 100% rename from apps/super-productivity/15.2.0/data.yml rename to apps/super-productivity/15.2.12/data.yml diff --git a/apps/super-productivity/15.2.0/docker-compose.yml b/apps/super-productivity/15.2.12/docker-compose.yml similarity index 100% rename from apps/super-productivity/15.2.0/docker-compose.yml rename to apps/super-productivity/15.2.12/docker-compose.yml diff --git a/apps/super-productivity/15.2.0/envs/default.env b/apps/super-productivity/15.2.12/envs/default.env similarity index 100% rename from apps/super-productivity/15.2.0/envs/default.env rename to apps/super-productivity/15.2.12/envs/default.env diff --git a/apps/super-productivity/15.2.0/envs/global.env b/apps/super-productivity/15.2.12/envs/global.env similarity index 100% rename from apps/super-productivity/15.2.0/envs/global.env rename to apps/super-productivity/15.2.12/envs/global.env diff --git a/apps/super-productivity/15.2.0/scripts/init.sh b/apps/super-productivity/15.2.12/scripts/init.sh similarity index 100% rename from apps/super-productivity/15.2.0/scripts/init.sh rename to apps/super-productivity/15.2.12/scripts/init.sh diff --git a/apps/super-productivity/15.2.0/scripts/uninstall.sh b/apps/super-productivity/15.2.12/scripts/uninstall.sh similarity index 100% rename from apps/super-productivity/15.2.0/scripts/uninstall.sh rename to apps/super-productivity/15.2.12/scripts/uninstall.sh diff --git a/apps/super-productivity/15.2.0/scripts/upgrade.sh b/apps/super-productivity/15.2.12/scripts/upgrade.sh similarity index 100% rename from apps/super-productivity/15.2.0/scripts/upgrade.sh rename to apps/super-productivity/15.2.12/scripts/upgrade.sh From 023782fc67516ee9c77bcc42c25f3e3935306889 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 14:01:18 +0000 Subject: [PATCH 116/262] Update n8nio/n8n Docker tag to v1.116.0 --- apps/n8n/1.115.2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/n8n/1.115.2/docker-compose.yml b/apps/n8n/1.115.2/docker-compose.yml index 30092ae21..f34a82dc3 100644 --- a/apps/n8n/1.115.2/docker-compose.yml +++ b/apps/n8n/1.115.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: n8n: - image: n8nio/n8n:1.115.2 + image: n8nio/n8n:1.116.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 08245a01b549b193553b252da762748260ca8a23 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 14:01:27 +0000 Subject: [PATCH 117/262] Update app version [skip ci] --- apps/n8n/{1.115.2 => 1.116.0}/data.yml | 0 apps/n8n/{1.115.2 => 1.116.0}/docker-compose.yml | 0 apps/n8n/{1.115.2 => 1.116.0}/envs/default.env | 0 apps/n8n/{1.115.2 => 1.116.0}/envs/global.env | 0 apps/n8n/{1.115.2 => 1.116.0}/scripts/init.sh | 0 apps/n8n/{1.115.2 => 1.116.0}/scripts/uninstall.sh | 0 apps/n8n/{1.115.2 => 1.116.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/n8n/{1.115.2 => 1.116.0}/data.yml (100%) rename apps/n8n/{1.115.2 => 1.116.0}/docker-compose.yml (100%) rename apps/n8n/{1.115.2 => 1.116.0}/envs/default.env (100%) rename apps/n8n/{1.115.2 => 1.116.0}/envs/global.env (100%) rename apps/n8n/{1.115.2 => 1.116.0}/scripts/init.sh (100%) rename apps/n8n/{1.115.2 => 1.116.0}/scripts/uninstall.sh (100%) rename apps/n8n/{1.115.2 => 1.116.0}/scripts/upgrade.sh (100%) diff --git a/apps/n8n/1.115.2/data.yml b/apps/n8n/1.116.0/data.yml similarity index 100% rename from apps/n8n/1.115.2/data.yml rename to apps/n8n/1.116.0/data.yml diff --git a/apps/n8n/1.115.2/docker-compose.yml b/apps/n8n/1.116.0/docker-compose.yml similarity index 100% rename from apps/n8n/1.115.2/docker-compose.yml rename to apps/n8n/1.116.0/docker-compose.yml diff --git a/apps/n8n/1.115.2/envs/default.env b/apps/n8n/1.116.0/envs/default.env similarity index 100% rename from apps/n8n/1.115.2/envs/default.env rename to apps/n8n/1.116.0/envs/default.env diff --git a/apps/n8n/1.115.2/envs/global.env b/apps/n8n/1.116.0/envs/global.env similarity index 100% rename from apps/n8n/1.115.2/envs/global.env rename to apps/n8n/1.116.0/envs/global.env diff --git a/apps/n8n/1.115.2/scripts/init.sh b/apps/n8n/1.116.0/scripts/init.sh similarity index 100% rename from apps/n8n/1.115.2/scripts/init.sh rename to apps/n8n/1.116.0/scripts/init.sh diff --git a/apps/n8n/1.115.2/scripts/uninstall.sh b/apps/n8n/1.116.0/scripts/uninstall.sh similarity index 100% rename from apps/n8n/1.115.2/scripts/uninstall.sh rename to apps/n8n/1.116.0/scripts/uninstall.sh diff --git a/apps/n8n/1.115.2/scripts/upgrade.sh b/apps/n8n/1.116.0/scripts/upgrade.sh similarity index 100% rename from apps/n8n/1.115.2/scripts/upgrade.sh rename to apps/n8n/1.116.0/scripts/upgrade.sh From eac42d6b5c87768ae6cb2d157f3d6352130698ec Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Mon, 13 Oct 2025 15:22:00 +0000 Subject: [PATCH 118/262] Processed apps directory via GitHub Actions --- appstore/n8n/{1.115.2 => 1.116.0}/.env | 0 appstore/n8n/{1.115.2 => 1.116.0}/data.yml | 0 appstore/n8n/{1.115.2 => 1.116.0}/docker-compose.yml | 2 +- appstore/n8n/{1.115.2 => 1.116.0}/envs/default.env | 0 appstore/n8n/{1.115.2 => 1.116.0}/envs/global.env | 0 appstore/n8n/{1.115.2 => 1.116.0}/scripts/init.sh | 0 appstore/n8n/{1.115.2 => 1.116.0}/scripts/uninstall.sh | 0 appstore/n8n/{1.115.2 => 1.116.0}/scripts/upgrade.sh | 0 appstore/super-productivity/{15.2.0 => 15.2.12}/.env | 0 .../super-productivity/{15.2.0 => 15.2.12}/conf/webdav.yaml | 0 appstore/super-productivity/{15.2.0 => 15.2.12}/data.yml | 0 .../super-productivity/{15.2.0 => 15.2.12}/docker-compose.yml | 2 +- .../super-productivity/{15.2.0 => 15.2.12}/envs/default.env | 0 appstore/super-productivity/{15.2.0 => 15.2.12}/envs/global.env | 0 appstore/super-productivity/{15.2.0 => 15.2.12}/scripts/init.sh | 0 .../super-productivity/{15.2.0 => 15.2.12}/scripts/uninstall.sh | 0 .../super-productivity/{15.2.0 => 15.2.12}/scripts/upgrade.sh | 0 dockge/n8n/docker-compose.yml | 2 +- dockge/super-productivity/docker-compose.yml | 2 +- 19 files changed, 4 insertions(+), 4 deletions(-) rename appstore/n8n/{1.115.2 => 1.116.0}/.env (100%) rename appstore/n8n/{1.115.2 => 1.116.0}/data.yml (100%) rename appstore/n8n/{1.115.2 => 1.116.0}/docker-compose.yml (94%) rename appstore/n8n/{1.115.2 => 1.116.0}/envs/default.env (100%) rename appstore/n8n/{1.115.2 => 1.116.0}/envs/global.env (100%) rename appstore/n8n/{1.115.2 => 1.116.0}/scripts/init.sh (100%) rename appstore/n8n/{1.115.2 => 1.116.0}/scripts/uninstall.sh (100%) rename appstore/n8n/{1.115.2 => 1.116.0}/scripts/upgrade.sh (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/.env (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/conf/webdav.yaml (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/data.yml (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/docker-compose.yml (92%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/envs/default.env (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/envs/global.env (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/scripts/init.sh (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/scripts/uninstall.sh (100%) rename appstore/super-productivity/{15.2.0 => 15.2.12}/scripts/upgrade.sh (100%) diff --git a/appstore/n8n/1.115.2/.env b/appstore/n8n/1.116.0/.env similarity index 100% rename from appstore/n8n/1.115.2/.env rename to appstore/n8n/1.116.0/.env diff --git a/appstore/n8n/1.115.2/data.yml b/appstore/n8n/1.116.0/data.yml similarity index 100% rename from appstore/n8n/1.115.2/data.yml rename to appstore/n8n/1.116.0/data.yml diff --git a/appstore/n8n/1.115.2/docker-compose.yml b/appstore/n8n/1.116.0/docker-compose.yml similarity index 94% rename from appstore/n8n/1.115.2/docker-compose.yml rename to appstore/n8n/1.116.0/docker-compose.yml index 8ba4d8b58..61d2eda79 100644 --- a/appstore/n8n/1.115.2/docker-compose.yml +++ b/appstore/n8n/1.116.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.115.2 + image: n8nio/n8n:1.116.0 labels: createdBy: Apps networks: diff --git a/appstore/n8n/1.115.2/envs/default.env b/appstore/n8n/1.116.0/envs/default.env similarity index 100% rename from appstore/n8n/1.115.2/envs/default.env rename to appstore/n8n/1.116.0/envs/default.env diff --git a/appstore/n8n/1.115.2/envs/global.env b/appstore/n8n/1.116.0/envs/global.env similarity index 100% rename from appstore/n8n/1.115.2/envs/global.env rename to appstore/n8n/1.116.0/envs/global.env diff --git a/appstore/n8n/1.115.2/scripts/init.sh b/appstore/n8n/1.116.0/scripts/init.sh similarity index 100% rename from appstore/n8n/1.115.2/scripts/init.sh rename to appstore/n8n/1.116.0/scripts/init.sh diff --git a/appstore/n8n/1.115.2/scripts/uninstall.sh b/appstore/n8n/1.116.0/scripts/uninstall.sh similarity index 100% rename from appstore/n8n/1.115.2/scripts/uninstall.sh rename to appstore/n8n/1.116.0/scripts/uninstall.sh diff --git a/appstore/n8n/1.115.2/scripts/upgrade.sh b/appstore/n8n/1.116.0/scripts/upgrade.sh similarity index 100% rename from appstore/n8n/1.115.2/scripts/upgrade.sh rename to appstore/n8n/1.116.0/scripts/upgrade.sh diff --git a/appstore/super-productivity/15.2.0/.env b/appstore/super-productivity/15.2.12/.env similarity index 100% rename from appstore/super-productivity/15.2.0/.env rename to appstore/super-productivity/15.2.12/.env diff --git a/appstore/super-productivity/15.2.0/conf/webdav.yaml b/appstore/super-productivity/15.2.12/conf/webdav.yaml similarity index 100% rename from appstore/super-productivity/15.2.0/conf/webdav.yaml rename to appstore/super-productivity/15.2.12/conf/webdav.yaml diff --git a/appstore/super-productivity/15.2.0/data.yml b/appstore/super-productivity/15.2.12/data.yml similarity index 100% rename from appstore/super-productivity/15.2.0/data.yml rename to appstore/super-productivity/15.2.12/data.yml diff --git a/appstore/super-productivity/15.2.0/docker-compose.yml b/appstore/super-productivity/15.2.12/docker-compose.yml similarity index 92% rename from appstore/super-productivity/15.2.0/docker-compose.yml rename to appstore/super-productivity/15.2.12/docker-compose.yml index eb9500058..2b1bbc3ee 100644 --- a/appstore/super-productivity/15.2.0/docker-compose.yml +++ b/appstore/super-productivity/15.2.12/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.2.0 + image: johannesjo/super-productivity:v15.2.12 labels: createdBy: Apps networks: diff --git a/appstore/super-productivity/15.2.0/envs/default.env b/appstore/super-productivity/15.2.12/envs/default.env similarity index 100% rename from appstore/super-productivity/15.2.0/envs/default.env rename to appstore/super-productivity/15.2.12/envs/default.env diff --git a/appstore/super-productivity/15.2.0/envs/global.env b/appstore/super-productivity/15.2.12/envs/global.env similarity index 100% rename from appstore/super-productivity/15.2.0/envs/global.env rename to appstore/super-productivity/15.2.12/envs/global.env diff --git a/appstore/super-productivity/15.2.0/scripts/init.sh b/appstore/super-productivity/15.2.12/scripts/init.sh similarity index 100% rename from appstore/super-productivity/15.2.0/scripts/init.sh rename to appstore/super-productivity/15.2.12/scripts/init.sh diff --git a/appstore/super-productivity/15.2.0/scripts/uninstall.sh b/appstore/super-productivity/15.2.12/scripts/uninstall.sh similarity index 100% rename from appstore/super-productivity/15.2.0/scripts/uninstall.sh rename to appstore/super-productivity/15.2.12/scripts/uninstall.sh diff --git a/appstore/super-productivity/15.2.0/scripts/upgrade.sh b/appstore/super-productivity/15.2.12/scripts/upgrade.sh similarity index 100% rename from appstore/super-productivity/15.2.0/scripts/upgrade.sh rename to appstore/super-productivity/15.2.12/scripts/upgrade.sh diff --git a/dockge/n8n/docker-compose.yml b/dockge/n8n/docker-compose.yml index 8ba4d8b58..61d2eda79 100644 --- a/dockge/n8n/docker-compose.yml +++ b/dockge/n8n/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.115.2 + image: n8nio/n8n:1.116.0 labels: createdBy: Apps networks: diff --git a/dockge/super-productivity/docker-compose.yml b/dockge/super-productivity/docker-compose.yml index eb9500058..2b1bbc3ee 100644 --- a/dockge/super-productivity/docker-compose.yml +++ b/dockge/super-productivity/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.2.0 + image: johannesjo/super-productivity:v15.2.12 labels: createdBy: Apps networks: From 40f590160c5f0d1a5f0576dcacf59aed3535ccb2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 15:24:47 +0000 Subject: [PATCH 119/262] Update sn0wl1n/ech0 Docker tag to v2.8.1 --- apps/ech0/2.8.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.8.0/docker-compose.yml b/apps/ech0/2.8.0/docker-compose.yml index 0caf94675..ba7835efa 100644 --- a/apps/ech0/2.8.0/docker-compose.yml +++ b/apps/ech0/2.8.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.8.0 + image: sn0wl1n/ech0:v2.8.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From a0b8b51227f777d8fd6ca31dbe5aef86ed8231f8 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 15:24:58 +0000 Subject: [PATCH 120/262] Update app version [skip ci] --- apps/ech0/{2.8.0 => 2.8.1}/data.yml | 0 apps/ech0/{2.8.0 => 2.8.1}/docker-compose.yml | 0 apps/ech0/{2.8.0 => 2.8.1}/envs/default.env | 0 apps/ech0/{2.8.0 => 2.8.1}/envs/global.env | 0 apps/ech0/{2.8.0 => 2.8.1}/scripts/init.sh | 0 apps/ech0/{2.8.0 => 2.8.1}/scripts/uninstall.sh | 0 apps/ech0/{2.8.0 => 2.8.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.8.0 => 2.8.1}/data.yml (100%) rename apps/ech0/{2.8.0 => 2.8.1}/docker-compose.yml (100%) rename apps/ech0/{2.8.0 => 2.8.1}/envs/default.env (100%) rename apps/ech0/{2.8.0 => 2.8.1}/envs/global.env (100%) rename apps/ech0/{2.8.0 => 2.8.1}/scripts/init.sh (100%) rename apps/ech0/{2.8.0 => 2.8.1}/scripts/uninstall.sh (100%) rename apps/ech0/{2.8.0 => 2.8.1}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.8.0/data.yml b/apps/ech0/2.8.1/data.yml similarity index 100% rename from apps/ech0/2.8.0/data.yml rename to apps/ech0/2.8.1/data.yml diff --git a/apps/ech0/2.8.0/docker-compose.yml b/apps/ech0/2.8.1/docker-compose.yml similarity index 100% rename from apps/ech0/2.8.0/docker-compose.yml rename to apps/ech0/2.8.1/docker-compose.yml diff --git a/apps/ech0/2.8.0/envs/default.env b/apps/ech0/2.8.1/envs/default.env similarity index 100% rename from apps/ech0/2.8.0/envs/default.env rename to apps/ech0/2.8.1/envs/default.env diff --git a/apps/ech0/2.8.0/envs/global.env b/apps/ech0/2.8.1/envs/global.env similarity index 100% rename from apps/ech0/2.8.0/envs/global.env rename to apps/ech0/2.8.1/envs/global.env diff --git a/apps/ech0/2.8.0/scripts/init.sh b/apps/ech0/2.8.1/scripts/init.sh similarity index 100% rename from apps/ech0/2.8.0/scripts/init.sh rename to apps/ech0/2.8.1/scripts/init.sh diff --git a/apps/ech0/2.8.0/scripts/uninstall.sh b/apps/ech0/2.8.1/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.8.0/scripts/uninstall.sh rename to apps/ech0/2.8.1/scripts/uninstall.sh diff --git a/apps/ech0/2.8.0/scripts/upgrade.sh b/apps/ech0/2.8.1/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.8.0/scripts/upgrade.sh rename to apps/ech0/2.8.1/scripts/upgrade.sh From 91ee0bd420f0a163adb33ef902638bfecb58906f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 16:20:07 +0000 Subject: [PATCH 121/262] Update casbin/casdoor Docker tag to v2.80.0 --- apps/casdoor/2.78.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.78.0/docker-compose.yml b/apps/casdoor/2.78.0/docker-compose.yml index 02fd48991..8a74b1879 100644 --- a/apps/casdoor/2.78.0/docker-compose.yml +++ b/apps/casdoor/2.78.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.78.0 + image: casbin/casdoor:v2.80.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 02beadefa73cba0bd586afe5520b750233070b76 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 16:20:17 +0000 Subject: [PATCH 122/262] Update app version [skip ci] --- apps/casdoor/{2.78.0 => 2.80.0}/config/init_data.json | 0 apps/casdoor/{2.78.0 => 2.80.0}/data.yml | 0 apps/casdoor/{2.78.0 => 2.80.0}/docker-compose.yml | 0 apps/casdoor/{2.78.0 => 2.80.0}/envs/casdoor.env | 0 apps/casdoor/{2.78.0 => 2.80.0}/envs/default.env | 0 apps/casdoor/{2.78.0 => 2.80.0}/envs/global.env | 0 apps/casdoor/{2.78.0 => 2.80.0}/scripts/init.sh | 0 apps/casdoor/{2.78.0 => 2.80.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.78.0 => 2.80.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.78.0 => 2.80.0}/config/init_data.json (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/data.yml (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/docker-compose.yml (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/envs/default.env (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/envs/global.env (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/scripts/init.sh (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.78.0 => 2.80.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.78.0/config/init_data.json b/apps/casdoor/2.80.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.78.0/config/init_data.json rename to apps/casdoor/2.80.0/config/init_data.json diff --git a/apps/casdoor/2.78.0/data.yml b/apps/casdoor/2.80.0/data.yml similarity index 100% rename from apps/casdoor/2.78.0/data.yml rename to apps/casdoor/2.80.0/data.yml diff --git a/apps/casdoor/2.78.0/docker-compose.yml b/apps/casdoor/2.80.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.78.0/docker-compose.yml rename to apps/casdoor/2.80.0/docker-compose.yml diff --git a/apps/casdoor/2.78.0/envs/casdoor.env b/apps/casdoor/2.80.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.78.0/envs/casdoor.env rename to apps/casdoor/2.80.0/envs/casdoor.env diff --git a/apps/casdoor/2.78.0/envs/default.env b/apps/casdoor/2.80.0/envs/default.env similarity index 100% rename from apps/casdoor/2.78.0/envs/default.env rename to apps/casdoor/2.80.0/envs/default.env diff --git a/apps/casdoor/2.78.0/envs/global.env b/apps/casdoor/2.80.0/envs/global.env similarity index 100% rename from apps/casdoor/2.78.0/envs/global.env rename to apps/casdoor/2.80.0/envs/global.env diff --git a/apps/casdoor/2.78.0/scripts/init.sh b/apps/casdoor/2.80.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.78.0/scripts/init.sh rename to apps/casdoor/2.80.0/scripts/init.sh diff --git a/apps/casdoor/2.78.0/scripts/uninstall.sh b/apps/casdoor/2.80.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.78.0/scripts/uninstall.sh rename to apps/casdoor/2.80.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.78.0/scripts/upgrade.sh b/apps/casdoor/2.80.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.78.0/scripts/upgrade.sh rename to apps/casdoor/2.80.0/scripts/upgrade.sh From 3950713e138fa129c956e511a36dca30e2c34048 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 17:13:42 +0000 Subject: [PATCH 123/262] Update casbin/casdoor Docker tag to v2.81.0 --- apps/casdoor/2.80.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.80.0/docker-compose.yml b/apps/casdoor/2.80.0/docker-compose.yml index 8a74b1879..166fb814d 100644 --- a/apps/casdoor/2.80.0/docker-compose.yml +++ b/apps/casdoor/2.80.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.80.0 + image: casbin/casdoor:v2.81.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 528a15b81ea92bf850a650e118b2e7dd7121205a Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 17:13:54 +0000 Subject: [PATCH 124/262] Update app version [skip ci] --- apps/casdoor/{2.80.0 => 2.81.0}/config/init_data.json | 0 apps/casdoor/{2.80.0 => 2.81.0}/data.yml | 0 apps/casdoor/{2.80.0 => 2.81.0}/docker-compose.yml | 0 apps/casdoor/{2.80.0 => 2.81.0}/envs/casdoor.env | 0 apps/casdoor/{2.80.0 => 2.81.0}/envs/default.env | 0 apps/casdoor/{2.80.0 => 2.81.0}/envs/global.env | 0 apps/casdoor/{2.80.0 => 2.81.0}/scripts/init.sh | 0 apps/casdoor/{2.80.0 => 2.81.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.80.0 => 2.81.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.80.0 => 2.81.0}/config/init_data.json (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/data.yml (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/docker-compose.yml (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/envs/default.env (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/envs/global.env (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/scripts/init.sh (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.80.0 => 2.81.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.80.0/config/init_data.json b/apps/casdoor/2.81.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.80.0/config/init_data.json rename to apps/casdoor/2.81.0/config/init_data.json diff --git a/apps/casdoor/2.80.0/data.yml b/apps/casdoor/2.81.0/data.yml similarity index 100% rename from apps/casdoor/2.80.0/data.yml rename to apps/casdoor/2.81.0/data.yml diff --git a/apps/casdoor/2.80.0/docker-compose.yml b/apps/casdoor/2.81.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.80.0/docker-compose.yml rename to apps/casdoor/2.81.0/docker-compose.yml diff --git a/apps/casdoor/2.80.0/envs/casdoor.env b/apps/casdoor/2.81.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.80.0/envs/casdoor.env rename to apps/casdoor/2.81.0/envs/casdoor.env diff --git a/apps/casdoor/2.80.0/envs/default.env b/apps/casdoor/2.81.0/envs/default.env similarity index 100% rename from apps/casdoor/2.80.0/envs/default.env rename to apps/casdoor/2.81.0/envs/default.env diff --git a/apps/casdoor/2.80.0/envs/global.env b/apps/casdoor/2.81.0/envs/global.env similarity index 100% rename from apps/casdoor/2.80.0/envs/global.env rename to apps/casdoor/2.81.0/envs/global.env diff --git a/apps/casdoor/2.80.0/scripts/init.sh b/apps/casdoor/2.81.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.80.0/scripts/init.sh rename to apps/casdoor/2.81.0/scripts/init.sh diff --git a/apps/casdoor/2.80.0/scripts/uninstall.sh b/apps/casdoor/2.81.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.80.0/scripts/uninstall.sh rename to apps/casdoor/2.81.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.80.0/scripts/upgrade.sh b/apps/casdoor/2.81.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.80.0/scripts/upgrade.sh rename to apps/casdoor/2.81.0/scripts/upgrade.sh From 319854fab67fc3d868e99ce362c58d84cff25205 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 18:21:16 +0000 Subject: [PATCH 125/262] Update johannesjo/super-productivity Docker tag to v15.2.16 --- apps/super-productivity/15.2.12/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/super-productivity/15.2.12/docker-compose.yml b/apps/super-productivity/15.2.12/docker-compose.yml index 53ead8930..7e3431057 100644 --- a/apps/super-productivity/15.2.12/docker-compose.yml +++ b/apps/super-productivity/15.2.12/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: super-productivity: - image: johannesjo/super-productivity:v15.2.12 + image: johannesjo/super-productivity:v15.2.16 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From bfff4c51c44494e0b835cb0d1d08ba658171866b Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Mon, 13 Oct 2025 18:21:26 +0000 Subject: [PATCH 126/262] Update app version [skip ci] --- apps/super-productivity/{15.2.12 => 15.2.16}/conf/webdav.yaml | 0 apps/super-productivity/{15.2.12 => 15.2.16}/data.yml | 0 apps/super-productivity/{15.2.12 => 15.2.16}/docker-compose.yml | 0 apps/super-productivity/{15.2.12 => 15.2.16}/envs/default.env | 0 apps/super-productivity/{15.2.12 => 15.2.16}/envs/global.env | 0 apps/super-productivity/{15.2.12 => 15.2.16}/scripts/init.sh | 0 apps/super-productivity/{15.2.12 => 15.2.16}/scripts/uninstall.sh | 0 apps/super-productivity/{15.2.12 => 15.2.16}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/super-productivity/{15.2.12 => 15.2.16}/conf/webdav.yaml (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/data.yml (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/docker-compose.yml (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/envs/default.env (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/envs/global.env (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/scripts/init.sh (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/scripts/uninstall.sh (100%) rename apps/super-productivity/{15.2.12 => 15.2.16}/scripts/upgrade.sh (100%) diff --git a/apps/super-productivity/15.2.12/conf/webdav.yaml b/apps/super-productivity/15.2.16/conf/webdav.yaml similarity index 100% rename from apps/super-productivity/15.2.12/conf/webdav.yaml rename to apps/super-productivity/15.2.16/conf/webdav.yaml diff --git a/apps/super-productivity/15.2.12/data.yml b/apps/super-productivity/15.2.16/data.yml similarity index 100% rename from apps/super-productivity/15.2.12/data.yml rename to apps/super-productivity/15.2.16/data.yml diff --git a/apps/super-productivity/15.2.12/docker-compose.yml b/apps/super-productivity/15.2.16/docker-compose.yml similarity index 100% rename from apps/super-productivity/15.2.12/docker-compose.yml rename to apps/super-productivity/15.2.16/docker-compose.yml diff --git a/apps/super-productivity/15.2.12/envs/default.env b/apps/super-productivity/15.2.16/envs/default.env similarity index 100% rename from apps/super-productivity/15.2.12/envs/default.env rename to apps/super-productivity/15.2.16/envs/default.env diff --git a/apps/super-productivity/15.2.12/envs/global.env b/apps/super-productivity/15.2.16/envs/global.env similarity index 100% rename from apps/super-productivity/15.2.12/envs/global.env rename to apps/super-productivity/15.2.16/envs/global.env diff --git a/apps/super-productivity/15.2.12/scripts/init.sh b/apps/super-productivity/15.2.16/scripts/init.sh similarity index 100% rename from apps/super-productivity/15.2.12/scripts/init.sh rename to apps/super-productivity/15.2.16/scripts/init.sh diff --git a/apps/super-productivity/15.2.12/scripts/uninstall.sh b/apps/super-productivity/15.2.16/scripts/uninstall.sh similarity index 100% rename from apps/super-productivity/15.2.12/scripts/uninstall.sh rename to apps/super-productivity/15.2.16/scripts/uninstall.sh diff --git a/apps/super-productivity/15.2.12/scripts/upgrade.sh b/apps/super-productivity/15.2.16/scripts/upgrade.sh similarity index 100% rename from apps/super-productivity/15.2.12/scripts/upgrade.sh rename to apps/super-productivity/15.2.16/scripts/upgrade.sh From 8a77c123909d3236d1fb39b6d0af1b9780b3790d Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Mon, 13 Oct 2025 18:29:44 +0000 Subject: [PATCH 127/262] Processed apps directory via GitHub Actions --- appstore/casdoor/{2.78.0 => 2.81.0}/.env | 0 appstore/casdoor/{2.78.0 => 2.81.0}/config/init_data.json | 0 appstore/casdoor/{2.78.0 => 2.81.0}/data.yml | 0 appstore/casdoor/{2.78.0 => 2.81.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.78.0 => 2.81.0}/envs/casdoor.env | 0 appstore/casdoor/{2.78.0 => 2.81.0}/envs/default.env | 0 appstore/casdoor/{2.78.0 => 2.81.0}/envs/global.env | 0 appstore/casdoor/{2.78.0 => 2.81.0}/scripts/init.sh | 0 appstore/casdoor/{2.78.0 => 2.81.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.78.0 => 2.81.0}/scripts/upgrade.sh | 0 appstore/ech0/{2.8.0 => 2.8.1}/.env | 0 appstore/ech0/{2.8.0 => 2.8.1}/data.yml | 0 appstore/ech0/{2.8.0 => 2.8.1}/docker-compose.yml | 2 +- appstore/ech0/{2.8.0 => 2.8.1}/envs/default.env | 0 appstore/ech0/{2.8.0 => 2.8.1}/envs/global.env | 0 appstore/ech0/{2.8.0 => 2.8.1}/scripts/init.sh | 0 appstore/ech0/{2.8.0 => 2.8.1}/scripts/uninstall.sh | 0 appstore/ech0/{2.8.0 => 2.8.1}/scripts/upgrade.sh | 0 appstore/super-productivity/{15.2.12 => 15.2.16}/.env | 0 .../super-productivity/{15.2.12 => 15.2.16}/conf/webdav.yaml | 0 appstore/super-productivity/{15.2.12 => 15.2.16}/data.yml | 0 .../super-productivity/{15.2.12 => 15.2.16}/docker-compose.yml | 2 +- .../super-productivity/{15.2.12 => 15.2.16}/envs/default.env | 0 .../super-productivity/{15.2.12 => 15.2.16}/envs/global.env | 0 .../super-productivity/{15.2.12 => 15.2.16}/scripts/init.sh | 0 .../{15.2.12 => 15.2.16}/scripts/uninstall.sh | 0 .../super-productivity/{15.2.12 => 15.2.16}/scripts/upgrade.sh | 0 dockge/casdoor/docker-compose.yml | 2 +- dockge/ech0/docker-compose.yml | 2 +- dockge/super-productivity/docker-compose.yml | 2 +- 30 files changed, 6 insertions(+), 6 deletions(-) rename appstore/casdoor/{2.78.0 => 2.81.0}/.env (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/config/init_data.json (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/data.yml (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.78.0 => 2.81.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/envs/default.env (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/envs/global.env (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.78.0 => 2.81.0}/scripts/upgrade.sh (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/.env (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/data.yml (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/docker-compose.yml (93%) rename appstore/ech0/{2.8.0 => 2.8.1}/envs/default.env (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/envs/global.env (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/scripts/init.sh (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.8.0 => 2.8.1}/scripts/upgrade.sh (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/.env (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/conf/webdav.yaml (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/data.yml (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/docker-compose.yml (92%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/envs/default.env (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/envs/global.env (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/scripts/init.sh (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/scripts/uninstall.sh (100%) rename appstore/super-productivity/{15.2.12 => 15.2.16}/scripts/upgrade.sh (100%) diff --git a/appstore/casdoor/2.78.0/.env b/appstore/casdoor/2.81.0/.env similarity index 100% rename from appstore/casdoor/2.78.0/.env rename to appstore/casdoor/2.81.0/.env diff --git a/appstore/casdoor/2.78.0/config/init_data.json b/appstore/casdoor/2.81.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.78.0/config/init_data.json rename to appstore/casdoor/2.81.0/config/init_data.json diff --git a/appstore/casdoor/2.78.0/data.yml b/appstore/casdoor/2.81.0/data.yml similarity index 100% rename from appstore/casdoor/2.78.0/data.yml rename to appstore/casdoor/2.81.0/data.yml diff --git a/appstore/casdoor/2.78.0/docker-compose.yml b/appstore/casdoor/2.81.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.78.0/docker-compose.yml rename to appstore/casdoor/2.81.0/docker-compose.yml index 842095b10..7d605cb66 100644 --- a/appstore/casdoor/2.78.0/docker-compose.yml +++ b/appstore/casdoor/2.81.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.78.0 + image: casbin/casdoor:v2.81.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.78.0/envs/casdoor.env b/appstore/casdoor/2.81.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.78.0/envs/casdoor.env rename to appstore/casdoor/2.81.0/envs/casdoor.env diff --git a/appstore/casdoor/2.78.0/envs/default.env b/appstore/casdoor/2.81.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.78.0/envs/default.env rename to appstore/casdoor/2.81.0/envs/default.env diff --git a/appstore/casdoor/2.78.0/envs/global.env b/appstore/casdoor/2.81.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.78.0/envs/global.env rename to appstore/casdoor/2.81.0/envs/global.env diff --git a/appstore/casdoor/2.78.0/scripts/init.sh b/appstore/casdoor/2.81.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.78.0/scripts/init.sh rename to appstore/casdoor/2.81.0/scripts/init.sh diff --git a/appstore/casdoor/2.78.0/scripts/uninstall.sh b/appstore/casdoor/2.81.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.78.0/scripts/uninstall.sh rename to appstore/casdoor/2.81.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.78.0/scripts/upgrade.sh b/appstore/casdoor/2.81.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.78.0/scripts/upgrade.sh rename to appstore/casdoor/2.81.0/scripts/upgrade.sh diff --git a/appstore/ech0/2.8.0/.env b/appstore/ech0/2.8.1/.env similarity index 100% rename from appstore/ech0/2.8.0/.env rename to appstore/ech0/2.8.1/.env diff --git a/appstore/ech0/2.8.0/data.yml b/appstore/ech0/2.8.1/data.yml similarity index 100% rename from appstore/ech0/2.8.0/data.yml rename to appstore/ech0/2.8.1/data.yml diff --git a/appstore/ech0/2.8.0/docker-compose.yml b/appstore/ech0/2.8.1/docker-compose.yml similarity index 93% rename from appstore/ech0/2.8.0/docker-compose.yml rename to appstore/ech0/2.8.1/docker-compose.yml index 524ebcafe..868d9a201 100644 --- a/appstore/ech0/2.8.0/docker-compose.yml +++ b/appstore/ech0/2.8.1/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.8.0 + image: sn0wl1n/ech0:v2.8.1 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.8.0/envs/default.env b/appstore/ech0/2.8.1/envs/default.env similarity index 100% rename from appstore/ech0/2.8.0/envs/default.env rename to appstore/ech0/2.8.1/envs/default.env diff --git a/appstore/ech0/2.8.0/envs/global.env b/appstore/ech0/2.8.1/envs/global.env similarity index 100% rename from appstore/ech0/2.8.0/envs/global.env rename to appstore/ech0/2.8.1/envs/global.env diff --git a/appstore/ech0/2.8.0/scripts/init.sh b/appstore/ech0/2.8.1/scripts/init.sh similarity index 100% rename from appstore/ech0/2.8.0/scripts/init.sh rename to appstore/ech0/2.8.1/scripts/init.sh diff --git a/appstore/ech0/2.8.0/scripts/uninstall.sh b/appstore/ech0/2.8.1/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.8.0/scripts/uninstall.sh rename to appstore/ech0/2.8.1/scripts/uninstall.sh diff --git a/appstore/ech0/2.8.0/scripts/upgrade.sh b/appstore/ech0/2.8.1/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.8.0/scripts/upgrade.sh rename to appstore/ech0/2.8.1/scripts/upgrade.sh diff --git a/appstore/super-productivity/15.2.12/.env b/appstore/super-productivity/15.2.16/.env similarity index 100% rename from appstore/super-productivity/15.2.12/.env rename to appstore/super-productivity/15.2.16/.env diff --git a/appstore/super-productivity/15.2.12/conf/webdav.yaml b/appstore/super-productivity/15.2.16/conf/webdav.yaml similarity index 100% rename from appstore/super-productivity/15.2.12/conf/webdav.yaml rename to appstore/super-productivity/15.2.16/conf/webdav.yaml diff --git a/appstore/super-productivity/15.2.12/data.yml b/appstore/super-productivity/15.2.16/data.yml similarity index 100% rename from appstore/super-productivity/15.2.12/data.yml rename to appstore/super-productivity/15.2.16/data.yml diff --git a/appstore/super-productivity/15.2.12/docker-compose.yml b/appstore/super-productivity/15.2.16/docker-compose.yml similarity index 92% rename from appstore/super-productivity/15.2.12/docker-compose.yml rename to appstore/super-productivity/15.2.16/docker-compose.yml index 2b1bbc3ee..45baca04d 100644 --- a/appstore/super-productivity/15.2.12/docker-compose.yml +++ b/appstore/super-productivity/15.2.16/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.2.12 + image: johannesjo/super-productivity:v15.2.16 labels: createdBy: Apps networks: diff --git a/appstore/super-productivity/15.2.12/envs/default.env b/appstore/super-productivity/15.2.16/envs/default.env similarity index 100% rename from appstore/super-productivity/15.2.12/envs/default.env rename to appstore/super-productivity/15.2.16/envs/default.env diff --git a/appstore/super-productivity/15.2.12/envs/global.env b/appstore/super-productivity/15.2.16/envs/global.env similarity index 100% rename from appstore/super-productivity/15.2.12/envs/global.env rename to appstore/super-productivity/15.2.16/envs/global.env diff --git a/appstore/super-productivity/15.2.12/scripts/init.sh b/appstore/super-productivity/15.2.16/scripts/init.sh similarity index 100% rename from appstore/super-productivity/15.2.12/scripts/init.sh rename to appstore/super-productivity/15.2.16/scripts/init.sh diff --git a/appstore/super-productivity/15.2.12/scripts/uninstall.sh b/appstore/super-productivity/15.2.16/scripts/uninstall.sh similarity index 100% rename from appstore/super-productivity/15.2.12/scripts/uninstall.sh rename to appstore/super-productivity/15.2.16/scripts/uninstall.sh diff --git a/appstore/super-productivity/15.2.12/scripts/upgrade.sh b/appstore/super-productivity/15.2.16/scripts/upgrade.sh similarity index 100% rename from appstore/super-productivity/15.2.12/scripts/upgrade.sh rename to appstore/super-productivity/15.2.16/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 842095b10..7d605cb66 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.78.0 + image: casbin/casdoor:v2.81.0 labels: createdBy: Apps networks: diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index 524ebcafe..868d9a201 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.8.0 + image: sn0wl1n/ech0:v2.8.1 labels: createdBy: Apps networks: diff --git a/dockge/super-productivity/docker-compose.yml b/dockge/super-productivity/docker-compose.yml index 2b1bbc3ee..45baca04d 100644 --- a/dockge/super-productivity/docker-compose.yml +++ b/dockge/super-productivity/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.2.12 + image: johannesjo/super-productivity:v15.2.16 labels: createdBy: Apps networks: From 4f7aaa931908438c8e69e1d74fb13987fbff28bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 05:03:38 +0000 Subject: [PATCH 128/262] Update cloudreve/cloudreve Docker tag to v4.9.1 --- apps/cloudreve/4.8.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cloudreve/4.8.0/docker-compose.yml b/apps/cloudreve/4.8.0/docker-compose.yml index fe443fad9..ea1d01ec4 100644 --- a/apps/cloudreve/4.8.0/docker-compose.yml +++ b/apps/cloudreve/4.8.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: cloudreve: - image: cloudreve/cloudreve:4.8.0 + image: cloudreve/cloudreve:4.9.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From e7374f72e75c9c9ce2169d6d80a99aae3b706546 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 05:03:48 +0000 Subject: [PATCH 129/262] Update app version [skip ci] --- apps/cloudreve/{4.8.0 => 4.9.1}/data.yml | 0 apps/cloudreve/{4.8.0 => 4.9.1}/docker-compose.yml | 0 apps/cloudreve/{4.8.0 => 4.9.1}/envs/default.env | 0 apps/cloudreve/{4.8.0 => 4.9.1}/envs/global.env | 0 apps/cloudreve/{4.8.0 => 4.9.1}/scripts/init.sh | 0 apps/cloudreve/{4.8.0 => 4.9.1}/scripts/uninstall.sh | 0 apps/cloudreve/{4.8.0 => 4.9.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/cloudreve/{4.8.0 => 4.9.1}/data.yml (100%) rename apps/cloudreve/{4.8.0 => 4.9.1}/docker-compose.yml (100%) rename apps/cloudreve/{4.8.0 => 4.9.1}/envs/default.env (100%) rename apps/cloudreve/{4.8.0 => 4.9.1}/envs/global.env (100%) rename apps/cloudreve/{4.8.0 => 4.9.1}/scripts/init.sh (100%) rename apps/cloudreve/{4.8.0 => 4.9.1}/scripts/uninstall.sh (100%) rename apps/cloudreve/{4.8.0 => 4.9.1}/scripts/upgrade.sh (100%) diff --git a/apps/cloudreve/4.8.0/data.yml b/apps/cloudreve/4.9.1/data.yml similarity index 100% rename from apps/cloudreve/4.8.0/data.yml rename to apps/cloudreve/4.9.1/data.yml diff --git a/apps/cloudreve/4.8.0/docker-compose.yml b/apps/cloudreve/4.9.1/docker-compose.yml similarity index 100% rename from apps/cloudreve/4.8.0/docker-compose.yml rename to apps/cloudreve/4.9.1/docker-compose.yml diff --git a/apps/cloudreve/4.8.0/envs/default.env b/apps/cloudreve/4.9.1/envs/default.env similarity index 100% rename from apps/cloudreve/4.8.0/envs/default.env rename to apps/cloudreve/4.9.1/envs/default.env diff --git a/apps/cloudreve/4.8.0/envs/global.env b/apps/cloudreve/4.9.1/envs/global.env similarity index 100% rename from apps/cloudreve/4.8.0/envs/global.env rename to apps/cloudreve/4.9.1/envs/global.env diff --git a/apps/cloudreve/4.8.0/scripts/init.sh b/apps/cloudreve/4.9.1/scripts/init.sh similarity index 100% rename from apps/cloudreve/4.8.0/scripts/init.sh rename to apps/cloudreve/4.9.1/scripts/init.sh diff --git a/apps/cloudreve/4.8.0/scripts/uninstall.sh b/apps/cloudreve/4.9.1/scripts/uninstall.sh similarity index 100% rename from apps/cloudreve/4.8.0/scripts/uninstall.sh rename to apps/cloudreve/4.9.1/scripts/uninstall.sh diff --git a/apps/cloudreve/4.8.0/scripts/upgrade.sh b/apps/cloudreve/4.9.1/scripts/upgrade.sh similarity index 100% rename from apps/cloudreve/4.8.0/scripts/upgrade.sh rename to apps/cloudreve/4.9.1/scripts/upgrade.sh From 6f0b0558f144e38cc5f6a8b5603955402672bc0c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 14 Oct 2025 06:32:11 +0000 Subject: [PATCH 130/262] Processed apps directory via GitHub Actions --- appstore/cloudreve/{4.8.0 => 4.9.1}/.env | 0 appstore/cloudreve/{4.8.0 => 4.9.1}/data.yml | 0 appstore/cloudreve/{4.8.0 => 4.9.1}/docker-compose.yml | 2 +- appstore/cloudreve/{4.8.0 => 4.9.1}/envs/default.env | 0 appstore/cloudreve/{4.8.0 => 4.9.1}/envs/global.env | 0 appstore/cloudreve/{4.8.0 => 4.9.1}/scripts/init.sh | 0 appstore/cloudreve/{4.8.0 => 4.9.1}/scripts/uninstall.sh | 0 appstore/cloudreve/{4.8.0 => 4.9.1}/scripts/upgrade.sh | 0 dockge/cloudreve/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/cloudreve/{4.8.0 => 4.9.1}/.env (100%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/data.yml (100%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/docker-compose.yml (91%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/envs/default.env (100%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/envs/global.env (100%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/scripts/init.sh (100%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/scripts/uninstall.sh (100%) rename appstore/cloudreve/{4.8.0 => 4.9.1}/scripts/upgrade.sh (100%) diff --git a/appstore/cloudreve/4.8.0/.env b/appstore/cloudreve/4.9.1/.env similarity index 100% rename from appstore/cloudreve/4.8.0/.env rename to appstore/cloudreve/4.9.1/.env diff --git a/appstore/cloudreve/4.8.0/data.yml b/appstore/cloudreve/4.9.1/data.yml similarity index 100% rename from appstore/cloudreve/4.8.0/data.yml rename to appstore/cloudreve/4.9.1/data.yml diff --git a/appstore/cloudreve/4.8.0/docker-compose.yml b/appstore/cloudreve/4.9.1/docker-compose.yml similarity index 91% rename from appstore/cloudreve/4.8.0/docker-compose.yml rename to appstore/cloudreve/4.9.1/docker-compose.yml index 905e52ac6..b720518da 100644 --- a/appstore/cloudreve/4.8.0/docker-compose.yml +++ b/appstore/cloudreve/4.9.1/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.8.0 + image: cloudreve/cloudreve:4.9.1 labels: createdBy: Apps networks: diff --git a/appstore/cloudreve/4.8.0/envs/default.env b/appstore/cloudreve/4.9.1/envs/default.env similarity index 100% rename from appstore/cloudreve/4.8.0/envs/default.env rename to appstore/cloudreve/4.9.1/envs/default.env diff --git a/appstore/cloudreve/4.8.0/envs/global.env b/appstore/cloudreve/4.9.1/envs/global.env similarity index 100% rename from appstore/cloudreve/4.8.0/envs/global.env rename to appstore/cloudreve/4.9.1/envs/global.env diff --git a/appstore/cloudreve/4.8.0/scripts/init.sh b/appstore/cloudreve/4.9.1/scripts/init.sh similarity index 100% rename from appstore/cloudreve/4.8.0/scripts/init.sh rename to appstore/cloudreve/4.9.1/scripts/init.sh diff --git a/appstore/cloudreve/4.8.0/scripts/uninstall.sh b/appstore/cloudreve/4.9.1/scripts/uninstall.sh similarity index 100% rename from appstore/cloudreve/4.8.0/scripts/uninstall.sh rename to appstore/cloudreve/4.9.1/scripts/uninstall.sh diff --git a/appstore/cloudreve/4.8.0/scripts/upgrade.sh b/appstore/cloudreve/4.9.1/scripts/upgrade.sh similarity index 100% rename from appstore/cloudreve/4.8.0/scripts/upgrade.sh rename to appstore/cloudreve/4.9.1/scripts/upgrade.sh diff --git a/dockge/cloudreve/docker-compose.yml b/dockge/cloudreve/docker-compose.yml index 905e52ac6..b720518da 100644 --- a/dockge/cloudreve/docker-compose.yml +++ b/dockge/cloudreve/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.8.0 + image: cloudreve/cloudreve:4.9.1 labels: createdBy: Apps networks: From 9b6c3c3e522b12c151ac563b352847291ca66293 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 06:33:46 +0000 Subject: [PATCH 131/262] Update b3log/siyuan Docker tag to v3.3.5 --- apps/siyuan/3.3.4/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/siyuan/3.3.4/docker-compose.yml b/apps/siyuan/3.3.4/docker-compose.yml index 06fe02d8d..3a7c16da3 100644 --- a/apps/siyuan/3.3.4/docker-compose.yml +++ b/apps/siyuan/3.3.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: siyuan: - image: b3log/siyuan:v3.3.4 + image: b3log/siyuan:v3.3.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 07b502384a77c4e8cbc6f825a4191d8f22f17eb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 06:33:51 +0000 Subject: [PATCH 132/262] Update wushuo894/ani-rss Docker tag to v2.2.17 --- apps/ani-rss/2.2.16/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/2.2.16/docker-compose.yml b/apps/ani-rss/2.2.16/docker-compose.yml index 7df96bf81..61e3bcaa8 100644 --- a/apps/ani-rss/2.2.16/docker-compose.yml +++ b/apps/ani-rss/2.2.16/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.2.16 + image: wushuo894/ani-rss:v2.2.17 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From d19635a4f3acc5e6f5e87d8c462e0ade1dffd9e9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 06:33:57 +0000 Subject: [PATCH 133/262] Update app version [skip ci] --- apps/siyuan/{3.3.4 => 3.3.5}/data.yml | 0 apps/siyuan/{3.3.4 => 3.3.5}/docker-compose.yml | 0 apps/siyuan/{3.3.4 => 3.3.5}/envs/default.env | 0 apps/siyuan/{3.3.4 => 3.3.5}/envs/global.env | 0 apps/siyuan/{3.3.4 => 3.3.5}/scripts/init.sh | 0 apps/siyuan/{3.3.4 => 3.3.5}/scripts/uninstall.sh | 0 apps/siyuan/{3.3.4 => 3.3.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/siyuan/{3.3.4 => 3.3.5}/data.yml (100%) rename apps/siyuan/{3.3.4 => 3.3.5}/docker-compose.yml (100%) rename apps/siyuan/{3.3.4 => 3.3.5}/envs/default.env (100%) rename apps/siyuan/{3.3.4 => 3.3.5}/envs/global.env (100%) rename apps/siyuan/{3.3.4 => 3.3.5}/scripts/init.sh (100%) rename apps/siyuan/{3.3.4 => 3.3.5}/scripts/uninstall.sh (100%) rename apps/siyuan/{3.3.4 => 3.3.5}/scripts/upgrade.sh (100%) diff --git a/apps/siyuan/3.3.4/data.yml b/apps/siyuan/3.3.5/data.yml similarity index 100% rename from apps/siyuan/3.3.4/data.yml rename to apps/siyuan/3.3.5/data.yml diff --git a/apps/siyuan/3.3.4/docker-compose.yml b/apps/siyuan/3.3.5/docker-compose.yml similarity index 100% rename from apps/siyuan/3.3.4/docker-compose.yml rename to apps/siyuan/3.3.5/docker-compose.yml diff --git a/apps/siyuan/3.3.4/envs/default.env b/apps/siyuan/3.3.5/envs/default.env similarity index 100% rename from apps/siyuan/3.3.4/envs/default.env rename to apps/siyuan/3.3.5/envs/default.env diff --git a/apps/siyuan/3.3.4/envs/global.env b/apps/siyuan/3.3.5/envs/global.env similarity index 100% rename from apps/siyuan/3.3.4/envs/global.env rename to apps/siyuan/3.3.5/envs/global.env diff --git a/apps/siyuan/3.3.4/scripts/init.sh b/apps/siyuan/3.3.5/scripts/init.sh similarity index 100% rename from apps/siyuan/3.3.4/scripts/init.sh rename to apps/siyuan/3.3.5/scripts/init.sh diff --git a/apps/siyuan/3.3.4/scripts/uninstall.sh b/apps/siyuan/3.3.5/scripts/uninstall.sh similarity index 100% rename from apps/siyuan/3.3.4/scripts/uninstall.sh rename to apps/siyuan/3.3.5/scripts/uninstall.sh diff --git a/apps/siyuan/3.3.4/scripts/upgrade.sh b/apps/siyuan/3.3.5/scripts/upgrade.sh similarity index 100% rename from apps/siyuan/3.3.4/scripts/upgrade.sh rename to apps/siyuan/3.3.5/scripts/upgrade.sh From d2f69a8908de3ecabded0124e2740b61305ff282 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 06:34:01 +0000 Subject: [PATCH 134/262] Update app version [skip ci] --- apps/ani-rss/{2.2.16 => 2.2.17}/data.yml | 0 apps/ani-rss/{2.2.16 => 2.2.17}/docker-compose.yml | 0 apps/ani-rss/{2.2.16 => 2.2.17}/envs/default.env | 0 apps/ani-rss/{2.2.16 => 2.2.17}/envs/global.env | 0 apps/ani-rss/{2.2.16 => 2.2.17}/scripts/init.sh | 0 apps/ani-rss/{2.2.16 => 2.2.17}/scripts/uninstall.sh | 0 apps/ani-rss/{2.2.16 => 2.2.17}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{2.2.16 => 2.2.17}/data.yml (100%) rename apps/ani-rss/{2.2.16 => 2.2.17}/docker-compose.yml (100%) rename apps/ani-rss/{2.2.16 => 2.2.17}/envs/default.env (100%) rename apps/ani-rss/{2.2.16 => 2.2.17}/envs/global.env (100%) rename apps/ani-rss/{2.2.16 => 2.2.17}/scripts/init.sh (100%) rename apps/ani-rss/{2.2.16 => 2.2.17}/scripts/uninstall.sh (100%) rename apps/ani-rss/{2.2.16 => 2.2.17}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/2.2.16/data.yml b/apps/ani-rss/2.2.17/data.yml similarity index 100% rename from apps/ani-rss/2.2.16/data.yml rename to apps/ani-rss/2.2.17/data.yml diff --git a/apps/ani-rss/2.2.16/docker-compose.yml b/apps/ani-rss/2.2.17/docker-compose.yml similarity index 100% rename from apps/ani-rss/2.2.16/docker-compose.yml rename to apps/ani-rss/2.2.17/docker-compose.yml diff --git a/apps/ani-rss/2.2.16/envs/default.env b/apps/ani-rss/2.2.17/envs/default.env similarity index 100% rename from apps/ani-rss/2.2.16/envs/default.env rename to apps/ani-rss/2.2.17/envs/default.env diff --git a/apps/ani-rss/2.2.16/envs/global.env b/apps/ani-rss/2.2.17/envs/global.env similarity index 100% rename from apps/ani-rss/2.2.16/envs/global.env rename to apps/ani-rss/2.2.17/envs/global.env diff --git a/apps/ani-rss/2.2.16/scripts/init.sh b/apps/ani-rss/2.2.17/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.2.16/scripts/init.sh rename to apps/ani-rss/2.2.17/scripts/init.sh diff --git a/apps/ani-rss/2.2.16/scripts/uninstall.sh b/apps/ani-rss/2.2.17/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.2.16/scripts/uninstall.sh rename to apps/ani-rss/2.2.17/scripts/uninstall.sh diff --git a/apps/ani-rss/2.2.16/scripts/upgrade.sh b/apps/ani-rss/2.2.17/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.2.16/scripts/upgrade.sh rename to apps/ani-rss/2.2.17/scripts/upgrade.sh From 5b46f576ecd8cd984cca8f36b584794f3e3853fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 08:52:22 +0000 Subject: [PATCH 135/262] Update ghcr.io/groupultra/telegram-search Docker tag to v1.1.21 --- apps/telegram-search/1.1.20/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/telegram-search/1.1.20/docker-compose.yml b/apps/telegram-search/1.1.20/docker-compose.yml index b75e6db6e..122595ec5 100644 --- a/apps/telegram-search/1.1.20/docker-compose.yml +++ b/apps/telegram-search/1.1.20/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: telegram_search: - image: ghcr.io/groupultra/telegram-search:1.1.20 + image: ghcr.io/groupultra/telegram-search:1.1.21 depends_on: telegram_search_pgvector: condition: service_healthy From eec2f0112fa7ccb1b823d7f067e26e9917d00c25 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 08:52:32 +0000 Subject: [PATCH 136/262] Update app version [skip ci] --- apps/telegram-search/{1.1.20 => 1.1.21}/config/config.yaml | 0 apps/telegram-search/{1.1.20 => 1.1.21}/config/init.sql | 0 apps/telegram-search/{1.1.20 => 1.1.21}/data.yml | 0 apps/telegram-search/{1.1.20 => 1.1.21}/docker-compose.yml | 0 apps/telegram-search/{1.1.20 => 1.1.21}/envs/default.env | 0 apps/telegram-search/{1.1.20 => 1.1.21}/envs/global.env | 0 apps/telegram-search/{1.1.20 => 1.1.21}/scripts/init.sh | 0 apps/telegram-search/{1.1.20 => 1.1.21}/scripts/uninstall.sh | 0 apps/telegram-search/{1.1.20 => 1.1.21}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/telegram-search/{1.1.20 => 1.1.21}/config/config.yaml (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/config/init.sql (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/data.yml (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/docker-compose.yml (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/envs/default.env (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/envs/global.env (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/scripts/init.sh (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/scripts/uninstall.sh (100%) rename apps/telegram-search/{1.1.20 => 1.1.21}/scripts/upgrade.sh (100%) diff --git a/apps/telegram-search/1.1.20/config/config.yaml b/apps/telegram-search/1.1.21/config/config.yaml similarity index 100% rename from apps/telegram-search/1.1.20/config/config.yaml rename to apps/telegram-search/1.1.21/config/config.yaml diff --git a/apps/telegram-search/1.1.20/config/init.sql b/apps/telegram-search/1.1.21/config/init.sql similarity index 100% rename from apps/telegram-search/1.1.20/config/init.sql rename to apps/telegram-search/1.1.21/config/init.sql diff --git a/apps/telegram-search/1.1.20/data.yml b/apps/telegram-search/1.1.21/data.yml similarity index 100% rename from apps/telegram-search/1.1.20/data.yml rename to apps/telegram-search/1.1.21/data.yml diff --git a/apps/telegram-search/1.1.20/docker-compose.yml b/apps/telegram-search/1.1.21/docker-compose.yml similarity index 100% rename from apps/telegram-search/1.1.20/docker-compose.yml rename to apps/telegram-search/1.1.21/docker-compose.yml diff --git a/apps/telegram-search/1.1.20/envs/default.env b/apps/telegram-search/1.1.21/envs/default.env similarity index 100% rename from apps/telegram-search/1.1.20/envs/default.env rename to apps/telegram-search/1.1.21/envs/default.env diff --git a/apps/telegram-search/1.1.20/envs/global.env b/apps/telegram-search/1.1.21/envs/global.env similarity index 100% rename from apps/telegram-search/1.1.20/envs/global.env rename to apps/telegram-search/1.1.21/envs/global.env diff --git a/apps/telegram-search/1.1.20/scripts/init.sh b/apps/telegram-search/1.1.21/scripts/init.sh similarity index 100% rename from apps/telegram-search/1.1.20/scripts/init.sh rename to apps/telegram-search/1.1.21/scripts/init.sh diff --git a/apps/telegram-search/1.1.20/scripts/uninstall.sh b/apps/telegram-search/1.1.21/scripts/uninstall.sh similarity index 100% rename from apps/telegram-search/1.1.20/scripts/uninstall.sh rename to apps/telegram-search/1.1.21/scripts/uninstall.sh diff --git a/apps/telegram-search/1.1.20/scripts/upgrade.sh b/apps/telegram-search/1.1.21/scripts/upgrade.sh similarity index 100% rename from apps/telegram-search/1.1.20/scripts/upgrade.sh rename to apps/telegram-search/1.1.21/scripts/upgrade.sh From a23c09453609336e1d65cc4c893b1fc0ed1a8271 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 14 Oct 2025 09:23:42 +0000 Subject: [PATCH 137/262] Processed apps directory via GitHub Actions --- appstore/ani-rss/{2.2.16 => 2.2.17}/.env | 0 appstore/ani-rss/{2.2.16 => 2.2.17}/data.yml | 0 appstore/ani-rss/{2.2.16 => 2.2.17}/docker-compose.yml | 2 +- appstore/ani-rss/{2.2.16 => 2.2.17}/envs/default.env | 0 appstore/ani-rss/{2.2.16 => 2.2.17}/envs/global.env | 0 appstore/ani-rss/{2.2.16 => 2.2.17}/scripts/init.sh | 0 appstore/ani-rss/{2.2.16 => 2.2.17}/scripts/uninstall.sh | 0 appstore/ani-rss/{2.2.16 => 2.2.17}/scripts/upgrade.sh | 0 appstore/siyuan/{3.3.4 => 3.3.5}/.env | 0 appstore/siyuan/{3.3.4 => 3.3.5}/data.yml | 0 appstore/siyuan/{3.3.4 => 3.3.5}/docker-compose.yml | 2 +- appstore/siyuan/{3.3.4 => 3.3.5}/envs/default.env | 0 appstore/siyuan/{3.3.4 => 3.3.5}/envs/global.env | 0 appstore/siyuan/{3.3.4 => 3.3.5}/scripts/init.sh | 0 appstore/siyuan/{3.3.4 => 3.3.5}/scripts/uninstall.sh | 0 appstore/siyuan/{3.3.4 => 3.3.5}/scripts/upgrade.sh | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/.env | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/config/config.yaml | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/config/init.sql | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/data.yml | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/docker-compose.yml | 2 +- appstore/telegram-search/{1.1.20 => 1.1.21}/envs/default.env | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/envs/global.env | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/scripts/init.sh | 0 .../telegram-search/{1.1.20 => 1.1.21}/scripts/uninstall.sh | 0 appstore/telegram-search/{1.1.20 => 1.1.21}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 2 +- dockge/siyuan/docker-compose.yml | 2 +- dockge/telegram-search/docker-compose.yml | 2 +- 29 files changed, 6 insertions(+), 6 deletions(-) rename appstore/ani-rss/{2.2.16 => 2.2.17}/.env (100%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/data.yml (100%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/docker-compose.yml (95%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/envs/default.env (100%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/envs/global.env (100%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/scripts/init.sh (100%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.2.16 => 2.2.17}/scripts/upgrade.sh (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/.env (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/data.yml (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/docker-compose.yml (93%) rename appstore/siyuan/{3.3.4 => 3.3.5}/envs/default.env (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/envs/global.env (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/scripts/init.sh (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/scripts/uninstall.sh (100%) rename appstore/siyuan/{3.3.4 => 3.3.5}/scripts/upgrade.sh (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/.env (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/config/config.yaml (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/config/init.sql (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/data.yml (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/docker-compose.yml (96%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/envs/default.env (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/envs/global.env (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/scripts/init.sh (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/scripts/uninstall.sh (100%) rename appstore/telegram-search/{1.1.20 => 1.1.21}/scripts/upgrade.sh (100%) diff --git a/appstore/ani-rss/2.2.16/.env b/appstore/ani-rss/2.2.17/.env similarity index 100% rename from appstore/ani-rss/2.2.16/.env rename to appstore/ani-rss/2.2.17/.env diff --git a/appstore/ani-rss/2.2.16/data.yml b/appstore/ani-rss/2.2.17/data.yml similarity index 100% rename from appstore/ani-rss/2.2.16/data.yml rename to appstore/ani-rss/2.2.17/data.yml diff --git a/appstore/ani-rss/2.2.16/docker-compose.yml b/appstore/ani-rss/2.2.17/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.2.16/docker-compose.yml rename to appstore/ani-rss/2.2.17/docker-compose.yml index 3b0aa3cd5..0206047bb 100644 --- a/appstore/ani-rss/2.2.16/docker-compose.yml +++ b/appstore/ani-rss/2.2.17/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.16 + image: wushuo894/ani-rss:v2.2.17 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/2.2.16/envs/default.env b/appstore/ani-rss/2.2.17/envs/default.env similarity index 100% rename from appstore/ani-rss/2.2.16/envs/default.env rename to appstore/ani-rss/2.2.17/envs/default.env diff --git a/appstore/ani-rss/2.2.16/envs/global.env b/appstore/ani-rss/2.2.17/envs/global.env similarity index 100% rename from appstore/ani-rss/2.2.16/envs/global.env rename to appstore/ani-rss/2.2.17/envs/global.env diff --git a/appstore/ani-rss/2.2.16/scripts/init.sh b/appstore/ani-rss/2.2.17/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.2.16/scripts/init.sh rename to appstore/ani-rss/2.2.17/scripts/init.sh diff --git a/appstore/ani-rss/2.2.16/scripts/uninstall.sh b/appstore/ani-rss/2.2.17/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.2.16/scripts/uninstall.sh rename to appstore/ani-rss/2.2.17/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.2.16/scripts/upgrade.sh b/appstore/ani-rss/2.2.17/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.2.16/scripts/upgrade.sh rename to appstore/ani-rss/2.2.17/scripts/upgrade.sh diff --git a/appstore/siyuan/3.3.4/.env b/appstore/siyuan/3.3.5/.env similarity index 100% rename from appstore/siyuan/3.3.4/.env rename to appstore/siyuan/3.3.5/.env diff --git a/appstore/siyuan/3.3.4/data.yml b/appstore/siyuan/3.3.5/data.yml similarity index 100% rename from appstore/siyuan/3.3.4/data.yml rename to appstore/siyuan/3.3.5/data.yml diff --git a/appstore/siyuan/3.3.4/docker-compose.yml b/appstore/siyuan/3.3.5/docker-compose.yml similarity index 93% rename from appstore/siyuan/3.3.4/docker-compose.yml rename to appstore/siyuan/3.3.5/docker-compose.yml index ead9f5a23..a20812c21 100644 --- a/appstore/siyuan/3.3.4/docker-compose.yml +++ b/appstore/siyuan/3.3.5/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./envs/global.env environment: - RUN_IN_CONTAINER=true - image: b3log/siyuan:v3.3.4 + image: b3log/siyuan:v3.3.5 labels: createdBy: Apps networks: diff --git a/appstore/siyuan/3.3.4/envs/default.env b/appstore/siyuan/3.3.5/envs/default.env similarity index 100% rename from appstore/siyuan/3.3.4/envs/default.env rename to appstore/siyuan/3.3.5/envs/default.env diff --git a/appstore/siyuan/3.3.4/envs/global.env b/appstore/siyuan/3.3.5/envs/global.env similarity index 100% rename from appstore/siyuan/3.3.4/envs/global.env rename to appstore/siyuan/3.3.5/envs/global.env diff --git a/appstore/siyuan/3.3.4/scripts/init.sh b/appstore/siyuan/3.3.5/scripts/init.sh similarity index 100% rename from appstore/siyuan/3.3.4/scripts/init.sh rename to appstore/siyuan/3.3.5/scripts/init.sh diff --git a/appstore/siyuan/3.3.4/scripts/uninstall.sh b/appstore/siyuan/3.3.5/scripts/uninstall.sh similarity index 100% rename from appstore/siyuan/3.3.4/scripts/uninstall.sh rename to appstore/siyuan/3.3.5/scripts/uninstall.sh diff --git a/appstore/siyuan/3.3.4/scripts/upgrade.sh b/appstore/siyuan/3.3.5/scripts/upgrade.sh similarity index 100% rename from appstore/siyuan/3.3.4/scripts/upgrade.sh rename to appstore/siyuan/3.3.5/scripts/upgrade.sh diff --git a/appstore/telegram-search/1.1.20/.env b/appstore/telegram-search/1.1.21/.env similarity index 100% rename from appstore/telegram-search/1.1.20/.env rename to appstore/telegram-search/1.1.21/.env diff --git a/appstore/telegram-search/1.1.20/config/config.yaml b/appstore/telegram-search/1.1.21/config/config.yaml similarity index 100% rename from appstore/telegram-search/1.1.20/config/config.yaml rename to appstore/telegram-search/1.1.21/config/config.yaml diff --git a/appstore/telegram-search/1.1.20/config/init.sql b/appstore/telegram-search/1.1.21/config/init.sql similarity index 100% rename from appstore/telegram-search/1.1.20/config/init.sql rename to appstore/telegram-search/1.1.21/config/init.sql diff --git a/appstore/telegram-search/1.1.20/data.yml b/appstore/telegram-search/1.1.21/data.yml similarity index 100% rename from appstore/telegram-search/1.1.20/data.yml rename to appstore/telegram-search/1.1.21/data.yml diff --git a/appstore/telegram-search/1.1.20/docker-compose.yml b/appstore/telegram-search/1.1.21/docker-compose.yml similarity index 96% rename from appstore/telegram-search/1.1.20/docker-compose.yml rename to appstore/telegram-search/1.1.21/docker-compose.yml index 4fcc3ce8e..50cbd6814 100644 --- a/appstore/telegram-search/1.1.20/docker-compose.yml +++ b/appstore/telegram-search/1.1.21/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - DATABASE_TYPE=postgres - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@telegram_search_pgvector:5432/${POSTGRES_DATABASE} - image: ghcr.io/groupultra/telegram-search:1.1.20 + image: ghcr.io/groupultra/telegram-search:1.1.21 labels: createdBy: Apps networks: diff --git a/appstore/telegram-search/1.1.20/envs/default.env b/appstore/telegram-search/1.1.21/envs/default.env similarity index 100% rename from appstore/telegram-search/1.1.20/envs/default.env rename to appstore/telegram-search/1.1.21/envs/default.env diff --git a/appstore/telegram-search/1.1.20/envs/global.env b/appstore/telegram-search/1.1.21/envs/global.env similarity index 100% rename from appstore/telegram-search/1.1.20/envs/global.env rename to appstore/telegram-search/1.1.21/envs/global.env diff --git a/appstore/telegram-search/1.1.20/scripts/init.sh b/appstore/telegram-search/1.1.21/scripts/init.sh similarity index 100% rename from appstore/telegram-search/1.1.20/scripts/init.sh rename to appstore/telegram-search/1.1.21/scripts/init.sh diff --git a/appstore/telegram-search/1.1.20/scripts/uninstall.sh b/appstore/telegram-search/1.1.21/scripts/uninstall.sh similarity index 100% rename from appstore/telegram-search/1.1.20/scripts/uninstall.sh rename to appstore/telegram-search/1.1.21/scripts/uninstall.sh diff --git a/appstore/telegram-search/1.1.20/scripts/upgrade.sh b/appstore/telegram-search/1.1.21/scripts/upgrade.sh similarity index 100% rename from appstore/telegram-search/1.1.20/scripts/upgrade.sh rename to appstore/telegram-search/1.1.21/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 3b0aa3cd5..0206047bb 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.16 + image: wushuo894/ani-rss:v2.2.17 labels: createdBy: Apps networks: diff --git a/dockge/siyuan/docker-compose.yml b/dockge/siyuan/docker-compose.yml index ead9f5a23..a20812c21 100644 --- a/dockge/siyuan/docker-compose.yml +++ b/dockge/siyuan/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./envs/global.env environment: - RUN_IN_CONTAINER=true - image: b3log/siyuan:v3.3.4 + image: b3log/siyuan:v3.3.5 labels: createdBy: Apps networks: diff --git a/dockge/telegram-search/docker-compose.yml b/dockge/telegram-search/docker-compose.yml index 4fcc3ce8e..50cbd6814 100644 --- a/dockge/telegram-search/docker-compose.yml +++ b/dockge/telegram-search/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - DATABASE_TYPE=postgres - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@telegram_search_pgvector:5432/${POSTGRES_DATABASE} - image: ghcr.io/groupultra/telegram-search:1.1.20 + image: ghcr.io/groupultra/telegram-search:1.1.21 labels: createdBy: Apps networks: From 49dc5593b5bd1c13459cc4e5ec25ef7c7fbe43a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:18:15 +0000 Subject: [PATCH 138/262] Update cloudnas/clouddrive2 Docker tag to v0.9.10 --- apps/clouddrive2/0.9.9/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/clouddrive2/0.9.9/docker-compose.yml b/apps/clouddrive2/0.9.9/docker-compose.yml index 3ec90b003..db2340d36 100644 --- a/apps/clouddrive2/0.9.9/docker-compose.yml +++ b/apps/clouddrive2/0.9.9/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: clouddrive2: - image: cloudnas/clouddrive2:0.9.9 + image: cloudnas/clouddrive2:0.9.10 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 01f272fc212b38ace775cf35c05585f286d9d6d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:18:20 +0000 Subject: [PATCH 139/262] Update sn0wl1n/ech0 Docker tag to v2.8.2 --- apps/ech0/2.8.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.8.1/docker-compose.yml b/apps/ech0/2.8.1/docker-compose.yml index ba7835efa..69d191c40 100644 --- a/apps/ech0/2.8.1/docker-compose.yml +++ b/apps/ech0/2.8.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.8.1 + image: sn0wl1n/ech0:v2.8.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From ffe42356c0989445955d62ff7cd2a56e993085f9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 10:18:25 +0000 Subject: [PATCH 140/262] Update app version [skip ci] --- apps/clouddrive2/{0.9.9 => 0.9.10}/data.yml | 0 apps/clouddrive2/{0.9.9 => 0.9.10}/docker-compose.yml | 0 apps/clouddrive2/{0.9.9 => 0.9.10}/envs/default.env | 0 apps/clouddrive2/{0.9.9 => 0.9.10}/envs/global.env | 0 apps/clouddrive2/{0.9.9 => 0.9.10}/scripts/init.sh | 0 apps/clouddrive2/{0.9.9 => 0.9.10}/scripts/uninstall.sh | 0 apps/clouddrive2/{0.9.9 => 0.9.10}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/clouddrive2/{0.9.9 => 0.9.10}/data.yml (100%) rename apps/clouddrive2/{0.9.9 => 0.9.10}/docker-compose.yml (100%) rename apps/clouddrive2/{0.9.9 => 0.9.10}/envs/default.env (100%) rename apps/clouddrive2/{0.9.9 => 0.9.10}/envs/global.env (100%) rename apps/clouddrive2/{0.9.9 => 0.9.10}/scripts/init.sh (100%) rename apps/clouddrive2/{0.9.9 => 0.9.10}/scripts/uninstall.sh (100%) rename apps/clouddrive2/{0.9.9 => 0.9.10}/scripts/upgrade.sh (100%) diff --git a/apps/clouddrive2/0.9.9/data.yml b/apps/clouddrive2/0.9.10/data.yml similarity index 100% rename from apps/clouddrive2/0.9.9/data.yml rename to apps/clouddrive2/0.9.10/data.yml diff --git a/apps/clouddrive2/0.9.9/docker-compose.yml b/apps/clouddrive2/0.9.10/docker-compose.yml similarity index 100% rename from apps/clouddrive2/0.9.9/docker-compose.yml rename to apps/clouddrive2/0.9.10/docker-compose.yml diff --git a/apps/clouddrive2/0.9.9/envs/default.env b/apps/clouddrive2/0.9.10/envs/default.env similarity index 100% rename from apps/clouddrive2/0.9.9/envs/default.env rename to apps/clouddrive2/0.9.10/envs/default.env diff --git a/apps/clouddrive2/0.9.9/envs/global.env b/apps/clouddrive2/0.9.10/envs/global.env similarity index 100% rename from apps/clouddrive2/0.9.9/envs/global.env rename to apps/clouddrive2/0.9.10/envs/global.env diff --git a/apps/clouddrive2/0.9.9/scripts/init.sh b/apps/clouddrive2/0.9.10/scripts/init.sh similarity index 100% rename from apps/clouddrive2/0.9.9/scripts/init.sh rename to apps/clouddrive2/0.9.10/scripts/init.sh diff --git a/apps/clouddrive2/0.9.9/scripts/uninstall.sh b/apps/clouddrive2/0.9.10/scripts/uninstall.sh similarity index 100% rename from apps/clouddrive2/0.9.9/scripts/uninstall.sh rename to apps/clouddrive2/0.9.10/scripts/uninstall.sh diff --git a/apps/clouddrive2/0.9.9/scripts/upgrade.sh b/apps/clouddrive2/0.9.10/scripts/upgrade.sh similarity index 100% rename from apps/clouddrive2/0.9.9/scripts/upgrade.sh rename to apps/clouddrive2/0.9.10/scripts/upgrade.sh From 790376c8bc39d948c7aaaa41742c4a269f138d0b Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 10:18:30 +0000 Subject: [PATCH 141/262] Update app version [skip ci] --- apps/ech0/{2.8.1 => 2.8.2}/data.yml | 0 apps/ech0/{2.8.1 => 2.8.2}/docker-compose.yml | 0 apps/ech0/{2.8.1 => 2.8.2}/envs/default.env | 0 apps/ech0/{2.8.1 => 2.8.2}/envs/global.env | 0 apps/ech0/{2.8.1 => 2.8.2}/scripts/init.sh | 0 apps/ech0/{2.8.1 => 2.8.2}/scripts/uninstall.sh | 0 apps/ech0/{2.8.1 => 2.8.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.8.1 => 2.8.2}/data.yml (100%) rename apps/ech0/{2.8.1 => 2.8.2}/docker-compose.yml (100%) rename apps/ech0/{2.8.1 => 2.8.2}/envs/default.env (100%) rename apps/ech0/{2.8.1 => 2.8.2}/envs/global.env (100%) rename apps/ech0/{2.8.1 => 2.8.2}/scripts/init.sh (100%) rename apps/ech0/{2.8.1 => 2.8.2}/scripts/uninstall.sh (100%) rename apps/ech0/{2.8.1 => 2.8.2}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.8.1/data.yml b/apps/ech0/2.8.2/data.yml similarity index 100% rename from apps/ech0/2.8.1/data.yml rename to apps/ech0/2.8.2/data.yml diff --git a/apps/ech0/2.8.1/docker-compose.yml b/apps/ech0/2.8.2/docker-compose.yml similarity index 100% rename from apps/ech0/2.8.1/docker-compose.yml rename to apps/ech0/2.8.2/docker-compose.yml diff --git a/apps/ech0/2.8.1/envs/default.env b/apps/ech0/2.8.2/envs/default.env similarity index 100% rename from apps/ech0/2.8.1/envs/default.env rename to apps/ech0/2.8.2/envs/default.env diff --git a/apps/ech0/2.8.1/envs/global.env b/apps/ech0/2.8.2/envs/global.env similarity index 100% rename from apps/ech0/2.8.1/envs/global.env rename to apps/ech0/2.8.2/envs/global.env diff --git a/apps/ech0/2.8.1/scripts/init.sh b/apps/ech0/2.8.2/scripts/init.sh similarity index 100% rename from apps/ech0/2.8.1/scripts/init.sh rename to apps/ech0/2.8.2/scripts/init.sh diff --git a/apps/ech0/2.8.1/scripts/uninstall.sh b/apps/ech0/2.8.2/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.8.1/scripts/uninstall.sh rename to apps/ech0/2.8.2/scripts/uninstall.sh diff --git a/apps/ech0/2.8.1/scripts/upgrade.sh b/apps/ech0/2.8.2/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.8.1/scripts/upgrade.sh rename to apps/ech0/2.8.2/scripts/upgrade.sh From ba724fbc8c1473cf555910c6d3884e444912c9a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:14:24 +0000 Subject: [PATCH 142/262] Update casbin/casdoor Docker tag to v2.82.0 --- apps/casdoor/2.81.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.81.0/docker-compose.yml b/apps/casdoor/2.81.0/docker-compose.yml index 166fb814d..9b20d0233 100644 --- a/apps/casdoor/2.81.0/docker-compose.yml +++ b/apps/casdoor/2.81.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.81.0 + image: casbin/casdoor:v2.82.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 5e6cfa23ca1371fdf3e506e14f481c56f5ba8bd2 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 11:14:35 +0000 Subject: [PATCH 143/262] Update app version [skip ci] --- apps/casdoor/{2.81.0 => 2.82.0}/config/init_data.json | 0 apps/casdoor/{2.81.0 => 2.82.0}/data.yml | 0 apps/casdoor/{2.81.0 => 2.82.0}/docker-compose.yml | 0 apps/casdoor/{2.81.0 => 2.82.0}/envs/casdoor.env | 0 apps/casdoor/{2.81.0 => 2.82.0}/envs/default.env | 0 apps/casdoor/{2.81.0 => 2.82.0}/envs/global.env | 0 apps/casdoor/{2.81.0 => 2.82.0}/scripts/init.sh | 0 apps/casdoor/{2.81.0 => 2.82.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.81.0 => 2.82.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.81.0 => 2.82.0}/config/init_data.json (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/data.yml (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/docker-compose.yml (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/envs/default.env (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/envs/global.env (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/scripts/init.sh (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.81.0 => 2.82.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.81.0/config/init_data.json b/apps/casdoor/2.82.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.81.0/config/init_data.json rename to apps/casdoor/2.82.0/config/init_data.json diff --git a/apps/casdoor/2.81.0/data.yml b/apps/casdoor/2.82.0/data.yml similarity index 100% rename from apps/casdoor/2.81.0/data.yml rename to apps/casdoor/2.82.0/data.yml diff --git a/apps/casdoor/2.81.0/docker-compose.yml b/apps/casdoor/2.82.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.81.0/docker-compose.yml rename to apps/casdoor/2.82.0/docker-compose.yml diff --git a/apps/casdoor/2.81.0/envs/casdoor.env b/apps/casdoor/2.82.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.81.0/envs/casdoor.env rename to apps/casdoor/2.82.0/envs/casdoor.env diff --git a/apps/casdoor/2.81.0/envs/default.env b/apps/casdoor/2.82.0/envs/default.env similarity index 100% rename from apps/casdoor/2.81.0/envs/default.env rename to apps/casdoor/2.82.0/envs/default.env diff --git a/apps/casdoor/2.81.0/envs/global.env b/apps/casdoor/2.82.0/envs/global.env similarity index 100% rename from apps/casdoor/2.81.0/envs/global.env rename to apps/casdoor/2.82.0/envs/global.env diff --git a/apps/casdoor/2.81.0/scripts/init.sh b/apps/casdoor/2.82.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.81.0/scripts/init.sh rename to apps/casdoor/2.82.0/scripts/init.sh diff --git a/apps/casdoor/2.81.0/scripts/uninstall.sh b/apps/casdoor/2.82.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.81.0/scripts/uninstall.sh rename to apps/casdoor/2.82.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.81.0/scripts/upgrade.sh b/apps/casdoor/2.82.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.81.0/scripts/upgrade.sh rename to apps/casdoor/2.82.0/scripts/upgrade.sh From 07cc3dbb2f3e8be674eca4014fbea678cd0e786f Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 14 Oct 2025 12:47:38 +0000 Subject: [PATCH 144/262] Processed apps directory via GitHub Actions --- appstore/casdoor/{2.81.0 => 2.82.0}/.env | 0 appstore/casdoor/{2.81.0 => 2.82.0}/config/init_data.json | 0 appstore/casdoor/{2.81.0 => 2.82.0}/data.yml | 0 appstore/casdoor/{2.81.0 => 2.82.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.81.0 => 2.82.0}/envs/casdoor.env | 0 appstore/casdoor/{2.81.0 => 2.82.0}/envs/default.env | 0 appstore/casdoor/{2.81.0 => 2.82.0}/envs/global.env | 0 appstore/casdoor/{2.81.0 => 2.82.0}/scripts/init.sh | 0 appstore/casdoor/{2.81.0 => 2.82.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.81.0 => 2.82.0}/scripts/upgrade.sh | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/.env | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/data.yml | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/docker-compose.yml | 2 +- appstore/clouddrive2/{0.9.9 => 0.9.10}/envs/default.env | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/envs/global.env | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/scripts/init.sh | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/scripts/uninstall.sh | 0 appstore/clouddrive2/{0.9.9 => 0.9.10}/scripts/upgrade.sh | 0 appstore/ech0/{2.8.1 => 2.8.2}/.env | 0 appstore/ech0/{2.8.1 => 2.8.2}/data.yml | 0 appstore/ech0/{2.8.1 => 2.8.2}/docker-compose.yml | 2 +- appstore/ech0/{2.8.1 => 2.8.2}/envs/default.env | 0 appstore/ech0/{2.8.1 => 2.8.2}/envs/global.env | 0 appstore/ech0/{2.8.1 => 2.8.2}/scripts/init.sh | 0 appstore/ech0/{2.8.1 => 2.8.2}/scripts/uninstall.sh | 0 appstore/ech0/{2.8.1 => 2.8.2}/scripts/upgrade.sh | 0 dockge/casdoor/docker-compose.yml | 2 +- dockge/clouddrive2/docker-compose.yml | 2 +- dockge/ech0/docker-compose.yml | 2 +- 29 files changed, 6 insertions(+), 6 deletions(-) rename appstore/casdoor/{2.81.0 => 2.82.0}/.env (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/config/init_data.json (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/data.yml (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.81.0 => 2.82.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/envs/default.env (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/envs/global.env (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.81.0 => 2.82.0}/scripts/upgrade.sh (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/.env (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/data.yml (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/docker-compose.yml (94%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/envs/default.env (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/envs/global.env (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/scripts/init.sh (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/scripts/uninstall.sh (100%) rename appstore/clouddrive2/{0.9.9 => 0.9.10}/scripts/upgrade.sh (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/.env (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/data.yml (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/docker-compose.yml (93%) rename appstore/ech0/{2.8.1 => 2.8.2}/envs/default.env (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/envs/global.env (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/scripts/init.sh (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.8.1 => 2.8.2}/scripts/upgrade.sh (100%) diff --git a/appstore/casdoor/2.81.0/.env b/appstore/casdoor/2.82.0/.env similarity index 100% rename from appstore/casdoor/2.81.0/.env rename to appstore/casdoor/2.82.0/.env diff --git a/appstore/casdoor/2.81.0/config/init_data.json b/appstore/casdoor/2.82.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.81.0/config/init_data.json rename to appstore/casdoor/2.82.0/config/init_data.json diff --git a/appstore/casdoor/2.81.0/data.yml b/appstore/casdoor/2.82.0/data.yml similarity index 100% rename from appstore/casdoor/2.81.0/data.yml rename to appstore/casdoor/2.82.0/data.yml diff --git a/appstore/casdoor/2.81.0/docker-compose.yml b/appstore/casdoor/2.82.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.81.0/docker-compose.yml rename to appstore/casdoor/2.82.0/docker-compose.yml index 7d605cb66..784a47209 100644 --- a/appstore/casdoor/2.81.0/docker-compose.yml +++ b/appstore/casdoor/2.82.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.81.0 + image: casbin/casdoor:v2.82.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.81.0/envs/casdoor.env b/appstore/casdoor/2.82.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.81.0/envs/casdoor.env rename to appstore/casdoor/2.82.0/envs/casdoor.env diff --git a/appstore/casdoor/2.81.0/envs/default.env b/appstore/casdoor/2.82.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.81.0/envs/default.env rename to appstore/casdoor/2.82.0/envs/default.env diff --git a/appstore/casdoor/2.81.0/envs/global.env b/appstore/casdoor/2.82.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.81.0/envs/global.env rename to appstore/casdoor/2.82.0/envs/global.env diff --git a/appstore/casdoor/2.81.0/scripts/init.sh b/appstore/casdoor/2.82.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.81.0/scripts/init.sh rename to appstore/casdoor/2.82.0/scripts/init.sh diff --git a/appstore/casdoor/2.81.0/scripts/uninstall.sh b/appstore/casdoor/2.82.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.81.0/scripts/uninstall.sh rename to appstore/casdoor/2.82.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.81.0/scripts/upgrade.sh b/appstore/casdoor/2.82.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.81.0/scripts/upgrade.sh rename to appstore/casdoor/2.82.0/scripts/upgrade.sh diff --git a/appstore/clouddrive2/0.9.9/.env b/appstore/clouddrive2/0.9.10/.env similarity index 100% rename from appstore/clouddrive2/0.9.9/.env rename to appstore/clouddrive2/0.9.10/.env diff --git a/appstore/clouddrive2/0.9.9/data.yml b/appstore/clouddrive2/0.9.10/data.yml similarity index 100% rename from appstore/clouddrive2/0.9.9/data.yml rename to appstore/clouddrive2/0.9.10/data.yml diff --git a/appstore/clouddrive2/0.9.9/docker-compose.yml b/appstore/clouddrive2/0.9.10/docker-compose.yml similarity index 94% rename from appstore/clouddrive2/0.9.9/docker-compose.yml rename to appstore/clouddrive2/0.9.10/docker-compose.yml index 33543f258..f7b9e69e2 100644 --- a/appstore/clouddrive2/0.9.9/docker-compose.yml +++ b/appstore/clouddrive2/0.9.10/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - TZ=Asia/Shanghai - CLOUDDRIVE_HOME=/Config - image: cloudnas/clouddrive2:0.9.9 + image: cloudnas/clouddrive2:0.9.10 labels: createdBy: Apps networks: diff --git a/appstore/clouddrive2/0.9.9/envs/default.env b/appstore/clouddrive2/0.9.10/envs/default.env similarity index 100% rename from appstore/clouddrive2/0.9.9/envs/default.env rename to appstore/clouddrive2/0.9.10/envs/default.env diff --git a/appstore/clouddrive2/0.9.9/envs/global.env b/appstore/clouddrive2/0.9.10/envs/global.env similarity index 100% rename from appstore/clouddrive2/0.9.9/envs/global.env rename to appstore/clouddrive2/0.9.10/envs/global.env diff --git a/appstore/clouddrive2/0.9.9/scripts/init.sh b/appstore/clouddrive2/0.9.10/scripts/init.sh similarity index 100% rename from appstore/clouddrive2/0.9.9/scripts/init.sh rename to appstore/clouddrive2/0.9.10/scripts/init.sh diff --git a/appstore/clouddrive2/0.9.9/scripts/uninstall.sh b/appstore/clouddrive2/0.9.10/scripts/uninstall.sh similarity index 100% rename from appstore/clouddrive2/0.9.9/scripts/uninstall.sh rename to appstore/clouddrive2/0.9.10/scripts/uninstall.sh diff --git a/appstore/clouddrive2/0.9.9/scripts/upgrade.sh b/appstore/clouddrive2/0.9.10/scripts/upgrade.sh similarity index 100% rename from appstore/clouddrive2/0.9.9/scripts/upgrade.sh rename to appstore/clouddrive2/0.9.10/scripts/upgrade.sh diff --git a/appstore/ech0/2.8.1/.env b/appstore/ech0/2.8.2/.env similarity index 100% rename from appstore/ech0/2.8.1/.env rename to appstore/ech0/2.8.2/.env diff --git a/appstore/ech0/2.8.1/data.yml b/appstore/ech0/2.8.2/data.yml similarity index 100% rename from appstore/ech0/2.8.1/data.yml rename to appstore/ech0/2.8.2/data.yml diff --git a/appstore/ech0/2.8.1/docker-compose.yml b/appstore/ech0/2.8.2/docker-compose.yml similarity index 93% rename from appstore/ech0/2.8.1/docker-compose.yml rename to appstore/ech0/2.8.2/docker-compose.yml index 868d9a201..bc50539ea 100644 --- a/appstore/ech0/2.8.1/docker-compose.yml +++ b/appstore/ech0/2.8.2/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.8.1 + image: sn0wl1n/ech0:v2.8.2 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.8.1/envs/default.env b/appstore/ech0/2.8.2/envs/default.env similarity index 100% rename from appstore/ech0/2.8.1/envs/default.env rename to appstore/ech0/2.8.2/envs/default.env diff --git a/appstore/ech0/2.8.1/envs/global.env b/appstore/ech0/2.8.2/envs/global.env similarity index 100% rename from appstore/ech0/2.8.1/envs/global.env rename to appstore/ech0/2.8.2/envs/global.env diff --git a/appstore/ech0/2.8.1/scripts/init.sh b/appstore/ech0/2.8.2/scripts/init.sh similarity index 100% rename from appstore/ech0/2.8.1/scripts/init.sh rename to appstore/ech0/2.8.2/scripts/init.sh diff --git a/appstore/ech0/2.8.1/scripts/uninstall.sh b/appstore/ech0/2.8.2/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.8.1/scripts/uninstall.sh rename to appstore/ech0/2.8.2/scripts/uninstall.sh diff --git a/appstore/ech0/2.8.1/scripts/upgrade.sh b/appstore/ech0/2.8.2/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.8.1/scripts/upgrade.sh rename to appstore/ech0/2.8.2/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 7d605cb66..784a47209 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.81.0 + image: casbin/casdoor:v2.82.0 labels: createdBy: Apps networks: diff --git a/dockge/clouddrive2/docker-compose.yml b/dockge/clouddrive2/docker-compose.yml index 33543f258..f7b9e69e2 100644 --- a/dockge/clouddrive2/docker-compose.yml +++ b/dockge/clouddrive2/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - TZ=Asia/Shanghai - CLOUDDRIVE_HOME=/Config - image: cloudnas/clouddrive2:0.9.9 + image: cloudnas/clouddrive2:0.9.10 labels: createdBy: Apps networks: diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index 868d9a201..bc50539ea 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.8.1 + image: sn0wl1n/ech0:v2.8.2 labels: createdBy: Apps networks: From f122739eb0a3fd5f52c5e98dc25e8e5808bdc1db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 12:53:35 +0000 Subject: [PATCH 145/262] Update mlikiowa/napcat-docker Docker tag to v4.8.120 --- apps/astrbot-napcat/4.8.119/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/astrbot-napcat/4.8.119/docker-compose.yml b/apps/astrbot-napcat/4.8.119/docker-compose.yml index 0c880128a..67f266b65 100644 --- a/apps/astrbot-napcat/4.8.119/docker-compose.yml +++ b/apps/astrbot-napcat/4.8.119/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: napcat: - image: mlikiowa/napcat-docker:v4.8.119 + image: mlikiowa/napcat-docker:v4.8.120 container_name: napcat-${CONTAINER_NAME} restart: always networks: From bbdcbfdefa8d8ccdd1edcb2b344e27f3759ae2e1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 12:53:45 +0000 Subject: [PATCH 146/262] Update app version [skip ci] --- apps/astrbot-napcat/{4.8.119 => 4.8.120}/data.yml | 0 apps/astrbot-napcat/{4.8.119 => 4.8.120}/docker-compose.yml | 0 apps/astrbot-napcat/{4.8.119 => 4.8.120}/envs/default.env | 0 apps/astrbot-napcat/{4.8.119 => 4.8.120}/envs/global.env | 0 apps/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/init.sh | 0 apps/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/uninstall.sh | 0 apps/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/data.yml (100%) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/docker-compose.yml (100%) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/envs/default.env (100%) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/envs/global.env (100%) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/init.sh (100%) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/uninstall.sh (100%) rename apps/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/upgrade.sh (100%) diff --git a/apps/astrbot-napcat/4.8.119/data.yml b/apps/astrbot-napcat/4.8.120/data.yml similarity index 100% rename from apps/astrbot-napcat/4.8.119/data.yml rename to apps/astrbot-napcat/4.8.120/data.yml diff --git a/apps/astrbot-napcat/4.8.119/docker-compose.yml b/apps/astrbot-napcat/4.8.120/docker-compose.yml similarity index 100% rename from apps/astrbot-napcat/4.8.119/docker-compose.yml rename to apps/astrbot-napcat/4.8.120/docker-compose.yml diff --git a/apps/astrbot-napcat/4.8.119/envs/default.env b/apps/astrbot-napcat/4.8.120/envs/default.env similarity index 100% rename from apps/astrbot-napcat/4.8.119/envs/default.env rename to apps/astrbot-napcat/4.8.120/envs/default.env diff --git a/apps/astrbot-napcat/4.8.119/envs/global.env b/apps/astrbot-napcat/4.8.120/envs/global.env similarity index 100% rename from apps/astrbot-napcat/4.8.119/envs/global.env rename to apps/astrbot-napcat/4.8.120/envs/global.env diff --git a/apps/astrbot-napcat/4.8.119/scripts/init.sh b/apps/astrbot-napcat/4.8.120/scripts/init.sh similarity index 100% rename from apps/astrbot-napcat/4.8.119/scripts/init.sh rename to apps/astrbot-napcat/4.8.120/scripts/init.sh diff --git a/apps/astrbot-napcat/4.8.119/scripts/uninstall.sh b/apps/astrbot-napcat/4.8.120/scripts/uninstall.sh similarity index 100% rename from apps/astrbot-napcat/4.8.119/scripts/uninstall.sh rename to apps/astrbot-napcat/4.8.120/scripts/uninstall.sh diff --git a/apps/astrbot-napcat/4.8.119/scripts/upgrade.sh b/apps/astrbot-napcat/4.8.120/scripts/upgrade.sh similarity index 100% rename from apps/astrbot-napcat/4.8.119/scripts/upgrade.sh rename to apps/astrbot-napcat/4.8.120/scripts/upgrade.sh From 4863215d8ee1b808f9b7f73003488706b9d6e889 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 13:29:20 +0000 Subject: [PATCH 147/262] Update casbin/casdoor Docker tag to v2.83.0 --- apps/casdoor/2.82.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.82.0/docker-compose.yml b/apps/casdoor/2.82.0/docker-compose.yml index 9b20d0233..7fec8274b 100644 --- a/apps/casdoor/2.82.0/docker-compose.yml +++ b/apps/casdoor/2.82.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.82.0 + image: casbin/casdoor:v2.83.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From b541f48aba84af740f49caf2dc6ba6b2db7a9fca Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 13:29:31 +0000 Subject: [PATCH 148/262] Update app version [skip ci] --- apps/casdoor/{2.82.0 => 2.83.0}/config/init_data.json | 0 apps/casdoor/{2.82.0 => 2.83.0}/data.yml | 0 apps/casdoor/{2.82.0 => 2.83.0}/docker-compose.yml | 0 apps/casdoor/{2.82.0 => 2.83.0}/envs/casdoor.env | 0 apps/casdoor/{2.82.0 => 2.83.0}/envs/default.env | 0 apps/casdoor/{2.82.0 => 2.83.0}/envs/global.env | 0 apps/casdoor/{2.82.0 => 2.83.0}/scripts/init.sh | 0 apps/casdoor/{2.82.0 => 2.83.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.82.0 => 2.83.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.82.0 => 2.83.0}/config/init_data.json (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/data.yml (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/docker-compose.yml (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/envs/default.env (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/envs/global.env (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/scripts/init.sh (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.82.0 => 2.83.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.82.0/config/init_data.json b/apps/casdoor/2.83.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.82.0/config/init_data.json rename to apps/casdoor/2.83.0/config/init_data.json diff --git a/apps/casdoor/2.82.0/data.yml b/apps/casdoor/2.83.0/data.yml similarity index 100% rename from apps/casdoor/2.82.0/data.yml rename to apps/casdoor/2.83.0/data.yml diff --git a/apps/casdoor/2.82.0/docker-compose.yml b/apps/casdoor/2.83.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.82.0/docker-compose.yml rename to apps/casdoor/2.83.0/docker-compose.yml diff --git a/apps/casdoor/2.82.0/envs/casdoor.env b/apps/casdoor/2.83.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.82.0/envs/casdoor.env rename to apps/casdoor/2.83.0/envs/casdoor.env diff --git a/apps/casdoor/2.82.0/envs/default.env b/apps/casdoor/2.83.0/envs/default.env similarity index 100% rename from apps/casdoor/2.82.0/envs/default.env rename to apps/casdoor/2.83.0/envs/default.env diff --git a/apps/casdoor/2.82.0/envs/global.env b/apps/casdoor/2.83.0/envs/global.env similarity index 100% rename from apps/casdoor/2.82.0/envs/global.env rename to apps/casdoor/2.83.0/envs/global.env diff --git a/apps/casdoor/2.82.0/scripts/init.sh b/apps/casdoor/2.83.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.82.0/scripts/init.sh rename to apps/casdoor/2.83.0/scripts/init.sh diff --git a/apps/casdoor/2.82.0/scripts/uninstall.sh b/apps/casdoor/2.83.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.82.0/scripts/uninstall.sh rename to apps/casdoor/2.83.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.82.0/scripts/upgrade.sh b/apps/casdoor/2.83.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.82.0/scripts/upgrade.sh rename to apps/casdoor/2.83.0/scripts/upgrade.sh From 5f055792e0fc4b58a485af401ab9f838dd32310d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 14:16:22 +0000 Subject: [PATCH 149/262] Update n8nio/n8n Docker tag to v1.116.1 --- apps/n8n/1.116.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/n8n/1.116.0/docker-compose.yml b/apps/n8n/1.116.0/docker-compose.yml index f34a82dc3..34b7a29f5 100644 --- a/apps/n8n/1.116.0/docker-compose.yml +++ b/apps/n8n/1.116.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: n8n: - image: n8nio/n8n:1.116.0 + image: n8nio/n8n:1.116.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 34f0a407495a4d74d196fb440eacab543cbda9ab Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 14:16:36 +0000 Subject: [PATCH 150/262] Update app version [skip ci] --- apps/n8n/{1.116.0 => 1.116.1}/data.yml | 0 apps/n8n/{1.116.0 => 1.116.1}/docker-compose.yml | 0 apps/n8n/{1.116.0 => 1.116.1}/envs/default.env | 0 apps/n8n/{1.116.0 => 1.116.1}/envs/global.env | 0 apps/n8n/{1.116.0 => 1.116.1}/scripts/init.sh | 0 apps/n8n/{1.116.0 => 1.116.1}/scripts/uninstall.sh | 0 apps/n8n/{1.116.0 => 1.116.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/n8n/{1.116.0 => 1.116.1}/data.yml (100%) rename apps/n8n/{1.116.0 => 1.116.1}/docker-compose.yml (100%) rename apps/n8n/{1.116.0 => 1.116.1}/envs/default.env (100%) rename apps/n8n/{1.116.0 => 1.116.1}/envs/global.env (100%) rename apps/n8n/{1.116.0 => 1.116.1}/scripts/init.sh (100%) rename apps/n8n/{1.116.0 => 1.116.1}/scripts/uninstall.sh (100%) rename apps/n8n/{1.116.0 => 1.116.1}/scripts/upgrade.sh (100%) diff --git a/apps/n8n/1.116.0/data.yml b/apps/n8n/1.116.1/data.yml similarity index 100% rename from apps/n8n/1.116.0/data.yml rename to apps/n8n/1.116.1/data.yml diff --git a/apps/n8n/1.116.0/docker-compose.yml b/apps/n8n/1.116.1/docker-compose.yml similarity index 100% rename from apps/n8n/1.116.0/docker-compose.yml rename to apps/n8n/1.116.1/docker-compose.yml diff --git a/apps/n8n/1.116.0/envs/default.env b/apps/n8n/1.116.1/envs/default.env similarity index 100% rename from apps/n8n/1.116.0/envs/default.env rename to apps/n8n/1.116.1/envs/default.env diff --git a/apps/n8n/1.116.0/envs/global.env b/apps/n8n/1.116.1/envs/global.env similarity index 100% rename from apps/n8n/1.116.0/envs/global.env rename to apps/n8n/1.116.1/envs/global.env diff --git a/apps/n8n/1.116.0/scripts/init.sh b/apps/n8n/1.116.1/scripts/init.sh similarity index 100% rename from apps/n8n/1.116.0/scripts/init.sh rename to apps/n8n/1.116.1/scripts/init.sh diff --git a/apps/n8n/1.116.0/scripts/uninstall.sh b/apps/n8n/1.116.1/scripts/uninstall.sh similarity index 100% rename from apps/n8n/1.116.0/scripts/uninstall.sh rename to apps/n8n/1.116.1/scripts/uninstall.sh diff --git a/apps/n8n/1.116.0/scripts/upgrade.sh b/apps/n8n/1.116.1/scripts/upgrade.sh similarity index 100% rename from apps/n8n/1.116.0/scripts/upgrade.sh rename to apps/n8n/1.116.1/scripts/upgrade.sh From 20317ba348f24319498f65fe394ca93be4f47149 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 15:17:52 +0000 Subject: [PATCH 151/262] Update casbin/casdoor Docker tag to v2.85.0 --- apps/casdoor/2.83.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.83.0/docker-compose.yml b/apps/casdoor/2.83.0/docker-compose.yml index 7fec8274b..63f2f346d 100644 --- a/apps/casdoor/2.83.0/docker-compose.yml +++ b/apps/casdoor/2.83.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.83.0 + image: casbin/casdoor:v2.85.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 9bd8d853e52bd1535073cfb3e8ba186e4903d3bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 15:17:57 +0000 Subject: [PATCH 152/262] Update matrixdotorg/synapse Docker tag to v1.140.0 --- apps/synapse/1.139.2/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/synapse/1.139.2/docker-compose.yml b/apps/synapse/1.139.2/docker-compose.yml index e03cca8df..62d5a1932 100644 --- a/apps/synapse/1.139.2/docker-compose.yml +++ b/apps/synapse/1.139.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: synapse-init: - image: matrixdotorg/synapse:v1.139.2 + image: matrixdotorg/synapse:v1.140.0 container_name: init-${CONTAINER_NAME} entrypoint: - /start.py @@ -22,7 +22,7 @@ services: - SYNAPSE_NO_TLS=true - SYNAPSE_HTTP_PORT=8008 synapse: - image: matrixdotorg/synapse:v1.139.2 + image: matrixdotorg/synapse:v1.140.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From e2142697c4aab721a8ddfc8d48f386df0aaad08d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 15:18:02 +0000 Subject: [PATCH 153/262] Update app version [skip ci] --- apps/casdoor/{2.83.0 => 2.85.0}/config/init_data.json | 0 apps/casdoor/{2.83.0 => 2.85.0}/data.yml | 0 apps/casdoor/{2.83.0 => 2.85.0}/docker-compose.yml | 0 apps/casdoor/{2.83.0 => 2.85.0}/envs/casdoor.env | 0 apps/casdoor/{2.83.0 => 2.85.0}/envs/default.env | 0 apps/casdoor/{2.83.0 => 2.85.0}/envs/global.env | 0 apps/casdoor/{2.83.0 => 2.85.0}/scripts/init.sh | 0 apps/casdoor/{2.83.0 => 2.85.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.83.0 => 2.85.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.83.0 => 2.85.0}/config/init_data.json (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/data.yml (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/docker-compose.yml (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/envs/default.env (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/envs/global.env (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/scripts/init.sh (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.83.0 => 2.85.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.83.0/config/init_data.json b/apps/casdoor/2.85.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.83.0/config/init_data.json rename to apps/casdoor/2.85.0/config/init_data.json diff --git a/apps/casdoor/2.83.0/data.yml b/apps/casdoor/2.85.0/data.yml similarity index 100% rename from apps/casdoor/2.83.0/data.yml rename to apps/casdoor/2.85.0/data.yml diff --git a/apps/casdoor/2.83.0/docker-compose.yml b/apps/casdoor/2.85.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.83.0/docker-compose.yml rename to apps/casdoor/2.85.0/docker-compose.yml diff --git a/apps/casdoor/2.83.0/envs/casdoor.env b/apps/casdoor/2.85.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.83.0/envs/casdoor.env rename to apps/casdoor/2.85.0/envs/casdoor.env diff --git a/apps/casdoor/2.83.0/envs/default.env b/apps/casdoor/2.85.0/envs/default.env similarity index 100% rename from apps/casdoor/2.83.0/envs/default.env rename to apps/casdoor/2.85.0/envs/default.env diff --git a/apps/casdoor/2.83.0/envs/global.env b/apps/casdoor/2.85.0/envs/global.env similarity index 100% rename from apps/casdoor/2.83.0/envs/global.env rename to apps/casdoor/2.85.0/envs/global.env diff --git a/apps/casdoor/2.83.0/scripts/init.sh b/apps/casdoor/2.85.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.83.0/scripts/init.sh rename to apps/casdoor/2.85.0/scripts/init.sh diff --git a/apps/casdoor/2.83.0/scripts/uninstall.sh b/apps/casdoor/2.85.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.83.0/scripts/uninstall.sh rename to apps/casdoor/2.85.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.83.0/scripts/upgrade.sh b/apps/casdoor/2.85.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.83.0/scripts/upgrade.sh rename to apps/casdoor/2.85.0/scripts/upgrade.sh From d4070422be4e136a62322fbbb155036693a21f6a Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 14 Oct 2025 15:18:08 +0000 Subject: [PATCH 154/262] Update app version [skip ci] --- apps/synapse/{1.139.2 => 1.140.0}/data.yml | 0 apps/synapse/{1.139.2 => 1.140.0}/docker-compose.yml | 0 apps/synapse/{1.139.2 => 1.140.0}/envs/default.env | 0 apps/synapse/{1.139.2 => 1.140.0}/envs/global.env | 0 apps/synapse/{1.139.2 => 1.140.0}/scripts/init.sh | 0 apps/synapse/{1.139.2 => 1.140.0}/scripts/uninstall.sh | 0 apps/synapse/{1.139.2 => 1.140.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/synapse/{1.139.2 => 1.140.0}/data.yml (100%) rename apps/synapse/{1.139.2 => 1.140.0}/docker-compose.yml (100%) rename apps/synapse/{1.139.2 => 1.140.0}/envs/default.env (100%) rename apps/synapse/{1.139.2 => 1.140.0}/envs/global.env (100%) rename apps/synapse/{1.139.2 => 1.140.0}/scripts/init.sh (100%) rename apps/synapse/{1.139.2 => 1.140.0}/scripts/uninstall.sh (100%) rename apps/synapse/{1.139.2 => 1.140.0}/scripts/upgrade.sh (100%) diff --git a/apps/synapse/1.139.2/data.yml b/apps/synapse/1.140.0/data.yml similarity index 100% rename from apps/synapse/1.139.2/data.yml rename to apps/synapse/1.140.0/data.yml diff --git a/apps/synapse/1.139.2/docker-compose.yml b/apps/synapse/1.140.0/docker-compose.yml similarity index 100% rename from apps/synapse/1.139.2/docker-compose.yml rename to apps/synapse/1.140.0/docker-compose.yml diff --git a/apps/synapse/1.139.2/envs/default.env b/apps/synapse/1.140.0/envs/default.env similarity index 100% rename from apps/synapse/1.139.2/envs/default.env rename to apps/synapse/1.140.0/envs/default.env diff --git a/apps/synapse/1.139.2/envs/global.env b/apps/synapse/1.140.0/envs/global.env similarity index 100% rename from apps/synapse/1.139.2/envs/global.env rename to apps/synapse/1.140.0/envs/global.env diff --git a/apps/synapse/1.139.2/scripts/init.sh b/apps/synapse/1.140.0/scripts/init.sh similarity index 100% rename from apps/synapse/1.139.2/scripts/init.sh rename to apps/synapse/1.140.0/scripts/init.sh diff --git a/apps/synapse/1.139.2/scripts/uninstall.sh b/apps/synapse/1.140.0/scripts/uninstall.sh similarity index 100% rename from apps/synapse/1.139.2/scripts/uninstall.sh rename to apps/synapse/1.140.0/scripts/uninstall.sh diff --git a/apps/synapse/1.139.2/scripts/upgrade.sh b/apps/synapse/1.140.0/scripts/upgrade.sh similarity index 100% rename from apps/synapse/1.139.2/scripts/upgrade.sh rename to apps/synapse/1.140.0/scripts/upgrade.sh From 5577aaacd10f0261748ae62849daaac0bd40dbe1 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 14 Oct 2025 15:24:05 +0000 Subject: [PATCH 155/262] Processed apps directory via GitHub Actions --- appstore/astrbot-napcat/{4.8.119 => 4.8.120}/.env | 0 appstore/astrbot-napcat/{4.8.119 => 4.8.120}/data.yml | 0 .../astrbot-napcat/{4.8.119 => 4.8.120}/docker-compose.yml | 2 +- appstore/astrbot-napcat/{4.8.119 => 4.8.120}/envs/default.env | 0 appstore/astrbot-napcat/{4.8.119 => 4.8.120}/envs/global.env | 0 appstore/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/init.sh | 0 .../astrbot-napcat/{4.8.119 => 4.8.120}/scripts/uninstall.sh | 0 .../astrbot-napcat/{4.8.119 => 4.8.120}/scripts/upgrade.sh | 0 appstore/casdoor/{2.82.0 => 2.85.0}/.env | 0 appstore/casdoor/{2.82.0 => 2.85.0}/config/init_data.json | 0 appstore/casdoor/{2.82.0 => 2.85.0}/data.yml | 0 appstore/casdoor/{2.82.0 => 2.85.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.82.0 => 2.85.0}/envs/casdoor.env | 0 appstore/casdoor/{2.82.0 => 2.85.0}/envs/default.env | 0 appstore/casdoor/{2.82.0 => 2.85.0}/envs/global.env | 0 appstore/casdoor/{2.82.0 => 2.85.0}/scripts/init.sh | 0 appstore/casdoor/{2.82.0 => 2.85.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.82.0 => 2.85.0}/scripts/upgrade.sh | 0 appstore/n8n/{1.116.0 => 1.116.1}/.env | 0 appstore/n8n/{1.116.0 => 1.116.1}/data.yml | 0 appstore/n8n/{1.116.0 => 1.116.1}/docker-compose.yml | 2 +- appstore/n8n/{1.116.0 => 1.116.1}/envs/default.env | 0 appstore/n8n/{1.116.0 => 1.116.1}/envs/global.env | 0 appstore/n8n/{1.116.0 => 1.116.1}/scripts/init.sh | 0 appstore/n8n/{1.116.0 => 1.116.1}/scripts/uninstall.sh | 0 appstore/n8n/{1.116.0 => 1.116.1}/scripts/upgrade.sh | 0 appstore/synapse/{1.139.2 => 1.140.0}/.env | 0 appstore/synapse/{1.139.2 => 1.140.0}/data.yml | 0 appstore/synapse/{1.139.2 => 1.140.0}/docker-compose.yml | 4 ++-- appstore/synapse/{1.139.2 => 1.140.0}/envs/default.env | 0 appstore/synapse/{1.139.2 => 1.140.0}/envs/global.env | 0 appstore/synapse/{1.139.2 => 1.140.0}/scripts/init.sh | 0 appstore/synapse/{1.139.2 => 1.140.0}/scripts/uninstall.sh | 0 appstore/synapse/{1.139.2 => 1.140.0}/scripts/upgrade.sh | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- dockge/casdoor/docker-compose.yml | 2 +- dockge/n8n/docker-compose.yml | 2 +- dockge/synapse/docker-compose.yml | 4 ++-- 38 files changed, 10 insertions(+), 10 deletions(-) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/.env (100%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/data.yml (100%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/docker-compose.yml (96%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/envs/default.env (100%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/envs/global.env (100%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/init.sh (100%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/uninstall.sh (100%) rename appstore/astrbot-napcat/{4.8.119 => 4.8.120}/scripts/upgrade.sh (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/.env (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/config/init_data.json (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/data.yml (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.82.0 => 2.85.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/envs/default.env (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/envs/global.env (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.82.0 => 2.85.0}/scripts/upgrade.sh (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/.env (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/data.yml (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/docker-compose.yml (94%) rename appstore/n8n/{1.116.0 => 1.116.1}/envs/default.env (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/envs/global.env (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/scripts/init.sh (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/scripts/uninstall.sh (100%) rename appstore/n8n/{1.116.0 => 1.116.1}/scripts/upgrade.sh (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/.env (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/data.yml (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/docker-compose.yml (89%) rename appstore/synapse/{1.139.2 => 1.140.0}/envs/default.env (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/envs/global.env (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/scripts/init.sh (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/scripts/uninstall.sh (100%) rename appstore/synapse/{1.139.2 => 1.140.0}/scripts/upgrade.sh (100%) diff --git a/appstore/astrbot-napcat/4.8.119/.env b/appstore/astrbot-napcat/4.8.120/.env similarity index 100% rename from appstore/astrbot-napcat/4.8.119/.env rename to appstore/astrbot-napcat/4.8.120/.env diff --git a/appstore/astrbot-napcat/4.8.119/data.yml b/appstore/astrbot-napcat/4.8.120/data.yml similarity index 100% rename from appstore/astrbot-napcat/4.8.119/data.yml rename to appstore/astrbot-napcat/4.8.120/data.yml diff --git a/appstore/astrbot-napcat/4.8.119/docker-compose.yml b/appstore/astrbot-napcat/4.8.120/docker-compose.yml similarity index 96% rename from appstore/astrbot-napcat/4.8.119/docker-compose.yml rename to appstore/astrbot-napcat/4.8.120/docker-compose.yml index e4727ddfa..63db2028f 100644 --- a/appstore/astrbot-napcat/4.8.119/docker-compose.yml +++ b/appstore/astrbot-napcat/4.8.120/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.119 + image: mlikiowa/napcat-docker:v4.8.120 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/appstore/astrbot-napcat/4.8.119/envs/default.env b/appstore/astrbot-napcat/4.8.120/envs/default.env similarity index 100% rename from appstore/astrbot-napcat/4.8.119/envs/default.env rename to appstore/astrbot-napcat/4.8.120/envs/default.env diff --git a/appstore/astrbot-napcat/4.8.119/envs/global.env b/appstore/astrbot-napcat/4.8.120/envs/global.env similarity index 100% rename from appstore/astrbot-napcat/4.8.119/envs/global.env rename to appstore/astrbot-napcat/4.8.120/envs/global.env diff --git a/appstore/astrbot-napcat/4.8.119/scripts/init.sh b/appstore/astrbot-napcat/4.8.120/scripts/init.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.119/scripts/init.sh rename to appstore/astrbot-napcat/4.8.120/scripts/init.sh diff --git a/appstore/astrbot-napcat/4.8.119/scripts/uninstall.sh b/appstore/astrbot-napcat/4.8.120/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.119/scripts/uninstall.sh rename to appstore/astrbot-napcat/4.8.120/scripts/uninstall.sh diff --git a/appstore/astrbot-napcat/4.8.119/scripts/upgrade.sh b/appstore/astrbot-napcat/4.8.120/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.119/scripts/upgrade.sh rename to appstore/astrbot-napcat/4.8.120/scripts/upgrade.sh diff --git a/appstore/casdoor/2.82.0/.env b/appstore/casdoor/2.85.0/.env similarity index 100% rename from appstore/casdoor/2.82.0/.env rename to appstore/casdoor/2.85.0/.env diff --git a/appstore/casdoor/2.82.0/config/init_data.json b/appstore/casdoor/2.85.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.82.0/config/init_data.json rename to appstore/casdoor/2.85.0/config/init_data.json diff --git a/appstore/casdoor/2.82.0/data.yml b/appstore/casdoor/2.85.0/data.yml similarity index 100% rename from appstore/casdoor/2.82.0/data.yml rename to appstore/casdoor/2.85.0/data.yml diff --git a/appstore/casdoor/2.82.0/docker-compose.yml b/appstore/casdoor/2.85.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.82.0/docker-compose.yml rename to appstore/casdoor/2.85.0/docker-compose.yml index 784a47209..d2f4a851b 100644 --- a/appstore/casdoor/2.82.0/docker-compose.yml +++ b/appstore/casdoor/2.85.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.82.0 + image: casbin/casdoor:v2.85.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.82.0/envs/casdoor.env b/appstore/casdoor/2.85.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.82.0/envs/casdoor.env rename to appstore/casdoor/2.85.0/envs/casdoor.env diff --git a/appstore/casdoor/2.82.0/envs/default.env b/appstore/casdoor/2.85.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.82.0/envs/default.env rename to appstore/casdoor/2.85.0/envs/default.env diff --git a/appstore/casdoor/2.82.0/envs/global.env b/appstore/casdoor/2.85.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.82.0/envs/global.env rename to appstore/casdoor/2.85.0/envs/global.env diff --git a/appstore/casdoor/2.82.0/scripts/init.sh b/appstore/casdoor/2.85.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.82.0/scripts/init.sh rename to appstore/casdoor/2.85.0/scripts/init.sh diff --git a/appstore/casdoor/2.82.0/scripts/uninstall.sh b/appstore/casdoor/2.85.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.82.0/scripts/uninstall.sh rename to appstore/casdoor/2.85.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.82.0/scripts/upgrade.sh b/appstore/casdoor/2.85.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.82.0/scripts/upgrade.sh rename to appstore/casdoor/2.85.0/scripts/upgrade.sh diff --git a/appstore/n8n/1.116.0/.env b/appstore/n8n/1.116.1/.env similarity index 100% rename from appstore/n8n/1.116.0/.env rename to appstore/n8n/1.116.1/.env diff --git a/appstore/n8n/1.116.0/data.yml b/appstore/n8n/1.116.1/data.yml similarity index 100% rename from appstore/n8n/1.116.0/data.yml rename to appstore/n8n/1.116.1/data.yml diff --git a/appstore/n8n/1.116.0/docker-compose.yml b/appstore/n8n/1.116.1/docker-compose.yml similarity index 94% rename from appstore/n8n/1.116.0/docker-compose.yml rename to appstore/n8n/1.116.1/docker-compose.yml index 61d2eda79..97fc3074e 100644 --- a/appstore/n8n/1.116.0/docker-compose.yml +++ b/appstore/n8n/1.116.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.116.0 + image: n8nio/n8n:1.116.1 labels: createdBy: Apps networks: diff --git a/appstore/n8n/1.116.0/envs/default.env b/appstore/n8n/1.116.1/envs/default.env similarity index 100% rename from appstore/n8n/1.116.0/envs/default.env rename to appstore/n8n/1.116.1/envs/default.env diff --git a/appstore/n8n/1.116.0/envs/global.env b/appstore/n8n/1.116.1/envs/global.env similarity index 100% rename from appstore/n8n/1.116.0/envs/global.env rename to appstore/n8n/1.116.1/envs/global.env diff --git a/appstore/n8n/1.116.0/scripts/init.sh b/appstore/n8n/1.116.1/scripts/init.sh similarity index 100% rename from appstore/n8n/1.116.0/scripts/init.sh rename to appstore/n8n/1.116.1/scripts/init.sh diff --git a/appstore/n8n/1.116.0/scripts/uninstall.sh b/appstore/n8n/1.116.1/scripts/uninstall.sh similarity index 100% rename from appstore/n8n/1.116.0/scripts/uninstall.sh rename to appstore/n8n/1.116.1/scripts/uninstall.sh diff --git a/appstore/n8n/1.116.0/scripts/upgrade.sh b/appstore/n8n/1.116.1/scripts/upgrade.sh similarity index 100% rename from appstore/n8n/1.116.0/scripts/upgrade.sh rename to appstore/n8n/1.116.1/scripts/upgrade.sh diff --git a/appstore/synapse/1.139.2/.env b/appstore/synapse/1.140.0/.env similarity index 100% rename from appstore/synapse/1.139.2/.env rename to appstore/synapse/1.140.0/.env diff --git a/appstore/synapse/1.139.2/data.yml b/appstore/synapse/1.140.0/data.yml similarity index 100% rename from appstore/synapse/1.139.2/data.yml rename to appstore/synapse/1.140.0/data.yml diff --git a/appstore/synapse/1.139.2/docker-compose.yml b/appstore/synapse/1.140.0/docker-compose.yml similarity index 89% rename from appstore/synapse/1.139.2/docker-compose.yml rename to appstore/synapse/1.140.0/docker-compose.yml index 58715bb2c..3cf451da0 100644 --- a/appstore/synapse/1.139.2/docker-compose.yml +++ b/appstore/synapse/1.140.0/docker-compose.yml @@ -9,7 +9,7 @@ services: env_file: - ./envs/global.env - .env - image: matrixdotorg/synapse:v1.139.2 + image: matrixdotorg/synapse:v1.140.0 labels: createdBy: Apps networks: @@ -31,7 +31,7 @@ services: - SYNAPSE_REPORT_STATS=no - SYNAPSE_NO_TLS=true - SYNAPSE_HTTP_PORT=8008 - image: matrixdotorg/synapse:v1.139.2 + image: matrixdotorg/synapse:v1.140.0 networks: - 1panel-network restart: false diff --git a/appstore/synapse/1.139.2/envs/default.env b/appstore/synapse/1.140.0/envs/default.env similarity index 100% rename from appstore/synapse/1.139.2/envs/default.env rename to appstore/synapse/1.140.0/envs/default.env diff --git a/appstore/synapse/1.139.2/envs/global.env b/appstore/synapse/1.140.0/envs/global.env similarity index 100% rename from appstore/synapse/1.139.2/envs/global.env rename to appstore/synapse/1.140.0/envs/global.env diff --git a/appstore/synapse/1.139.2/scripts/init.sh b/appstore/synapse/1.140.0/scripts/init.sh similarity index 100% rename from appstore/synapse/1.139.2/scripts/init.sh rename to appstore/synapse/1.140.0/scripts/init.sh diff --git a/appstore/synapse/1.139.2/scripts/uninstall.sh b/appstore/synapse/1.140.0/scripts/uninstall.sh similarity index 100% rename from appstore/synapse/1.139.2/scripts/uninstall.sh rename to appstore/synapse/1.140.0/scripts/uninstall.sh diff --git a/appstore/synapse/1.139.2/scripts/upgrade.sh b/appstore/synapse/1.140.0/scripts/upgrade.sh similarity index 100% rename from appstore/synapse/1.139.2/scripts/upgrade.sh rename to appstore/synapse/1.140.0/scripts/upgrade.sh diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index e4727ddfa..63db2028f 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.119 + image: mlikiowa/napcat-docker:v4.8.120 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 784a47209..d2f4a851b 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.82.0 + image: casbin/casdoor:v2.85.0 labels: createdBy: Apps networks: diff --git a/dockge/n8n/docker-compose.yml b/dockge/n8n/docker-compose.yml index 61d2eda79..97fc3074e 100644 --- a/dockge/n8n/docker-compose.yml +++ b/dockge/n8n/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.116.0 + image: n8nio/n8n:1.116.1 labels: createdBy: Apps networks: diff --git a/dockge/synapse/docker-compose.yml b/dockge/synapse/docker-compose.yml index 58715bb2c..3cf451da0 100644 --- a/dockge/synapse/docker-compose.yml +++ b/dockge/synapse/docker-compose.yml @@ -9,7 +9,7 @@ services: env_file: - ./envs/global.env - .env - image: matrixdotorg/synapse:v1.139.2 + image: matrixdotorg/synapse:v1.140.0 labels: createdBy: Apps networks: @@ -31,7 +31,7 @@ services: - SYNAPSE_REPORT_STATS=no - SYNAPSE_NO_TLS=true - SYNAPSE_HTTP_PORT=8008 - image: matrixdotorg/synapse:v1.139.2 + image: matrixdotorg/synapse:v1.140.0 networks: - 1panel-network restart: false From 3ff1b87bf8972c3e4d2f8d0b89b87fdffbc06ea0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 04:39:30 +0000 Subject: [PATCH 156/262] Update soulter/astrbot Docker tag to v4.3.5 --- apps/astrbot-napcat/4.8.120/docker-compose.yml | 2 +- apps/astrbot/4.3.3/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/astrbot-napcat/4.8.120/docker-compose.yml b/apps/astrbot-napcat/4.8.120/docker-compose.yml index 67f266b65..a9a641c82 100644 --- a/apps/astrbot-napcat/4.8.120/docker-compose.yml +++ b/apps/astrbot-napcat/4.8.120/docker-compose.yml @@ -24,7 +24,7 @@ services: - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} astrbot: - image: soulter/astrbot:v4.3.3 + image: soulter/astrbot:v4.3.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/astrbot/4.3.3/docker-compose.yml b/apps/astrbot/4.3.3/docker-compose.yml index 3249beddb..cc6ea8c36 100644 --- a/apps/astrbot/4.3.3/docker-compose.yml +++ b/apps/astrbot/4.3.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: astrbot: - image: soulter/astrbot:v4.3.3 + image: soulter/astrbot:v4.3.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From ca52bc0021d56986d8a0de28bec42bfffa81adb3 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 04:39:40 +0000 Subject: [PATCH 157/262] Update app version [skip ci] --- apps/astrbot/{4.3.3 => 4.3.5}/data.yml | 0 apps/astrbot/{4.3.3 => 4.3.5}/docker-compose.yml | 0 apps/astrbot/{4.3.3 => 4.3.5}/envs/default.env | 0 apps/astrbot/{4.3.3 => 4.3.5}/envs/global.env | 0 apps/astrbot/{4.3.3 => 4.3.5}/scripts/init.sh | 0 apps/astrbot/{4.3.3 => 4.3.5}/scripts/uninstall.sh | 0 apps/astrbot/{4.3.3 => 4.3.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/astrbot/{4.3.3 => 4.3.5}/data.yml (100%) rename apps/astrbot/{4.3.3 => 4.3.5}/docker-compose.yml (100%) rename apps/astrbot/{4.3.3 => 4.3.5}/envs/default.env (100%) rename apps/astrbot/{4.3.3 => 4.3.5}/envs/global.env (100%) rename apps/astrbot/{4.3.3 => 4.3.5}/scripts/init.sh (100%) rename apps/astrbot/{4.3.3 => 4.3.5}/scripts/uninstall.sh (100%) rename apps/astrbot/{4.3.3 => 4.3.5}/scripts/upgrade.sh (100%) diff --git a/apps/astrbot/4.3.3/data.yml b/apps/astrbot/4.3.5/data.yml similarity index 100% rename from apps/astrbot/4.3.3/data.yml rename to apps/astrbot/4.3.5/data.yml diff --git a/apps/astrbot/4.3.3/docker-compose.yml b/apps/astrbot/4.3.5/docker-compose.yml similarity index 100% rename from apps/astrbot/4.3.3/docker-compose.yml rename to apps/astrbot/4.3.5/docker-compose.yml diff --git a/apps/astrbot/4.3.3/envs/default.env b/apps/astrbot/4.3.5/envs/default.env similarity index 100% rename from apps/astrbot/4.3.3/envs/default.env rename to apps/astrbot/4.3.5/envs/default.env diff --git a/apps/astrbot/4.3.3/envs/global.env b/apps/astrbot/4.3.5/envs/global.env similarity index 100% rename from apps/astrbot/4.3.3/envs/global.env rename to apps/astrbot/4.3.5/envs/global.env diff --git a/apps/astrbot/4.3.3/scripts/init.sh b/apps/astrbot/4.3.5/scripts/init.sh similarity index 100% rename from apps/astrbot/4.3.3/scripts/init.sh rename to apps/astrbot/4.3.5/scripts/init.sh diff --git a/apps/astrbot/4.3.3/scripts/uninstall.sh b/apps/astrbot/4.3.5/scripts/uninstall.sh similarity index 100% rename from apps/astrbot/4.3.3/scripts/uninstall.sh rename to apps/astrbot/4.3.5/scripts/uninstall.sh diff --git a/apps/astrbot/4.3.3/scripts/upgrade.sh b/apps/astrbot/4.3.5/scripts/upgrade.sh similarity index 100% rename from apps/astrbot/4.3.3/scripts/upgrade.sh rename to apps/astrbot/4.3.5/scripts/upgrade.sh From 3ed89d4459fa54e4b9473c90d876e93693158be0 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Wed, 15 Oct 2025 06:32:18 +0000 Subject: [PATCH 158/262] Processed apps directory via GitHub Actions --- appstore/astrbot-napcat/4.8.120/docker-compose.yml | 2 +- appstore/astrbot/{4.3.3 => 4.3.5}/.env | 0 appstore/astrbot/{4.3.3 => 4.3.5}/data.yml | 0 appstore/astrbot/{4.3.3 => 4.3.5}/docker-compose.yml | 2 +- appstore/astrbot/{4.3.3 => 4.3.5}/envs/default.env | 0 appstore/astrbot/{4.3.3 => 4.3.5}/envs/global.env | 0 appstore/astrbot/{4.3.3 => 4.3.5}/scripts/init.sh | 0 appstore/astrbot/{4.3.3 => 4.3.5}/scripts/uninstall.sh | 0 appstore/astrbot/{4.3.3 => 4.3.5}/scripts/upgrade.sh | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- dockge/astrbot/docker-compose.yml | 2 +- 11 files changed, 4 insertions(+), 4 deletions(-) rename appstore/astrbot/{4.3.3 => 4.3.5}/.env (100%) rename appstore/astrbot/{4.3.3 => 4.3.5}/data.yml (100%) rename appstore/astrbot/{4.3.3 => 4.3.5}/docker-compose.yml (94%) rename appstore/astrbot/{4.3.3 => 4.3.5}/envs/default.env (100%) rename appstore/astrbot/{4.3.3 => 4.3.5}/envs/global.env (100%) rename appstore/astrbot/{4.3.3 => 4.3.5}/scripts/init.sh (100%) rename appstore/astrbot/{4.3.3 => 4.3.5}/scripts/uninstall.sh (100%) rename appstore/astrbot/{4.3.3 => 4.3.5}/scripts/upgrade.sh (100%) diff --git a/appstore/astrbot-napcat/4.8.120/docker-compose.yml b/appstore/astrbot-napcat/4.8.120/docker-compose.yml index 63db2028f..5f9fd2a59 100644 --- a/appstore/astrbot-napcat/4.8.120/docker-compose.yml +++ b/appstore/astrbot-napcat/4.8.120/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.3 + image: soulter/astrbot:v4.3.5 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.3.3/.env b/appstore/astrbot/4.3.5/.env similarity index 100% rename from appstore/astrbot/4.3.3/.env rename to appstore/astrbot/4.3.5/.env diff --git a/appstore/astrbot/4.3.3/data.yml b/appstore/astrbot/4.3.5/data.yml similarity index 100% rename from appstore/astrbot/4.3.3/data.yml rename to appstore/astrbot/4.3.5/data.yml diff --git a/appstore/astrbot/4.3.3/docker-compose.yml b/appstore/astrbot/4.3.5/docker-compose.yml similarity index 94% rename from appstore/astrbot/4.3.3/docker-compose.yml rename to appstore/astrbot/4.3.5/docker-compose.yml index 8eda00fe2..1c997f8d0 100644 --- a/appstore/astrbot/4.3.3/docker-compose.yml +++ b/appstore/astrbot/4.3.5/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.3 + image: soulter/astrbot:v4.3.5 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.3.3/envs/default.env b/appstore/astrbot/4.3.5/envs/default.env similarity index 100% rename from appstore/astrbot/4.3.3/envs/default.env rename to appstore/astrbot/4.3.5/envs/default.env diff --git a/appstore/astrbot/4.3.3/envs/global.env b/appstore/astrbot/4.3.5/envs/global.env similarity index 100% rename from appstore/astrbot/4.3.3/envs/global.env rename to appstore/astrbot/4.3.5/envs/global.env diff --git a/appstore/astrbot/4.3.3/scripts/init.sh b/appstore/astrbot/4.3.5/scripts/init.sh similarity index 100% rename from appstore/astrbot/4.3.3/scripts/init.sh rename to appstore/astrbot/4.3.5/scripts/init.sh diff --git a/appstore/astrbot/4.3.3/scripts/uninstall.sh b/appstore/astrbot/4.3.5/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot/4.3.3/scripts/uninstall.sh rename to appstore/astrbot/4.3.5/scripts/uninstall.sh diff --git a/appstore/astrbot/4.3.3/scripts/upgrade.sh b/appstore/astrbot/4.3.5/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot/4.3.3/scripts/upgrade.sh rename to appstore/astrbot/4.3.5/scripts/upgrade.sh diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index 63db2028f..5f9fd2a59 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.3 + image: soulter/astrbot:v4.3.5 labels: createdBy: Apps networks: diff --git a/dockge/astrbot/docker-compose.yml b/dockge/astrbot/docker-compose.yml index 8eda00fe2..1c997f8d0 100644 --- a/dockge/astrbot/docker-compose.yml +++ b/dockge/astrbot/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.3.3 + image: soulter/astrbot:v4.3.5 labels: createdBy: Apps networks: From b406f0fdfa3244081d03fa98872149519d4bc647 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 09:43:07 +0000 Subject: [PATCH 159/262] Update emby/embyserver Docker tag to v4.9.2.4 --- apps/emby/4.9.2.3/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emby/4.9.2.3/docker-compose.yml b/apps/emby/4.9.2.3/docker-compose.yml index 3c9c14fc7..f1f347b57 100644 --- a/apps/emby/4.9.2.3/docker-compose.yml +++ b/apps/emby/4.9.2.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby: - image: emby/embyserver:4.9.2.3 + image: emby/embyserver:4.9.2.4 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From f72f897fa1af016c60cdb8b1228f36c188ac136c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 09:43:12 +0000 Subject: [PATCH 160/262] Update ghcr.io/groupultra/telegram-search Docker tag to v1.1.22 --- apps/telegram-search/1.1.21/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/telegram-search/1.1.21/docker-compose.yml b/apps/telegram-search/1.1.21/docker-compose.yml index 122595ec5..c55b351da 100644 --- a/apps/telegram-search/1.1.21/docker-compose.yml +++ b/apps/telegram-search/1.1.21/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: telegram_search: - image: ghcr.io/groupultra/telegram-search:1.1.21 + image: ghcr.io/groupultra/telegram-search:1.1.22 depends_on: telegram_search_pgvector: condition: service_healthy From d52ef4daf77c6e3040092559d79df8ba99d0609c Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 09:43:19 +0000 Subject: [PATCH 161/262] Update app version [skip ci] --- apps/emby/{4.9.2.3 => 4.9.2.4}/data.yml | 0 apps/emby/{4.9.2.3 => 4.9.2.4}/docker-compose.yml | 0 apps/emby/{4.9.2.3 => 4.9.2.4}/envs/default.env | 0 apps/emby/{4.9.2.3 => 4.9.2.4}/envs/global.env | 0 apps/emby/{4.9.2.3 => 4.9.2.4}/scripts/init.sh | 0 apps/emby/{4.9.2.3 => 4.9.2.4}/scripts/uninstall.sh | 0 apps/emby/{4.9.2.3 => 4.9.2.4}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/emby/{4.9.2.3 => 4.9.2.4}/data.yml (100%) rename apps/emby/{4.9.2.3 => 4.9.2.4}/docker-compose.yml (100%) rename apps/emby/{4.9.2.3 => 4.9.2.4}/envs/default.env (100%) rename apps/emby/{4.9.2.3 => 4.9.2.4}/envs/global.env (100%) rename apps/emby/{4.9.2.3 => 4.9.2.4}/scripts/init.sh (100%) rename apps/emby/{4.9.2.3 => 4.9.2.4}/scripts/uninstall.sh (100%) rename apps/emby/{4.9.2.3 => 4.9.2.4}/scripts/upgrade.sh (100%) diff --git a/apps/emby/4.9.2.3/data.yml b/apps/emby/4.9.2.4/data.yml similarity index 100% rename from apps/emby/4.9.2.3/data.yml rename to apps/emby/4.9.2.4/data.yml diff --git a/apps/emby/4.9.2.3/docker-compose.yml b/apps/emby/4.9.2.4/docker-compose.yml similarity index 100% rename from apps/emby/4.9.2.3/docker-compose.yml rename to apps/emby/4.9.2.4/docker-compose.yml diff --git a/apps/emby/4.9.2.3/envs/default.env b/apps/emby/4.9.2.4/envs/default.env similarity index 100% rename from apps/emby/4.9.2.3/envs/default.env rename to apps/emby/4.9.2.4/envs/default.env diff --git a/apps/emby/4.9.2.3/envs/global.env b/apps/emby/4.9.2.4/envs/global.env similarity index 100% rename from apps/emby/4.9.2.3/envs/global.env rename to apps/emby/4.9.2.4/envs/global.env diff --git a/apps/emby/4.9.2.3/scripts/init.sh b/apps/emby/4.9.2.4/scripts/init.sh similarity index 100% rename from apps/emby/4.9.2.3/scripts/init.sh rename to apps/emby/4.9.2.4/scripts/init.sh diff --git a/apps/emby/4.9.2.3/scripts/uninstall.sh b/apps/emby/4.9.2.4/scripts/uninstall.sh similarity index 100% rename from apps/emby/4.9.2.3/scripts/uninstall.sh rename to apps/emby/4.9.2.4/scripts/uninstall.sh diff --git a/apps/emby/4.9.2.3/scripts/upgrade.sh b/apps/emby/4.9.2.4/scripts/upgrade.sh similarity index 100% rename from apps/emby/4.9.2.3/scripts/upgrade.sh rename to apps/emby/4.9.2.4/scripts/upgrade.sh From b65bd6ab11a258cd7c739fd7871825d95f72ff07 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 09:43:23 +0000 Subject: [PATCH 162/262] Update app version [skip ci] --- apps/telegram-search/{1.1.21 => 1.1.22}/config/config.yaml | 0 apps/telegram-search/{1.1.21 => 1.1.22}/config/init.sql | 0 apps/telegram-search/{1.1.21 => 1.1.22}/data.yml | 0 apps/telegram-search/{1.1.21 => 1.1.22}/docker-compose.yml | 0 apps/telegram-search/{1.1.21 => 1.1.22}/envs/default.env | 0 apps/telegram-search/{1.1.21 => 1.1.22}/envs/global.env | 0 apps/telegram-search/{1.1.21 => 1.1.22}/scripts/init.sh | 0 apps/telegram-search/{1.1.21 => 1.1.22}/scripts/uninstall.sh | 0 apps/telegram-search/{1.1.21 => 1.1.22}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/telegram-search/{1.1.21 => 1.1.22}/config/config.yaml (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/config/init.sql (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/data.yml (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/docker-compose.yml (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/envs/default.env (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/envs/global.env (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/scripts/init.sh (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/scripts/uninstall.sh (100%) rename apps/telegram-search/{1.1.21 => 1.1.22}/scripts/upgrade.sh (100%) diff --git a/apps/telegram-search/1.1.21/config/config.yaml b/apps/telegram-search/1.1.22/config/config.yaml similarity index 100% rename from apps/telegram-search/1.1.21/config/config.yaml rename to apps/telegram-search/1.1.22/config/config.yaml diff --git a/apps/telegram-search/1.1.21/config/init.sql b/apps/telegram-search/1.1.22/config/init.sql similarity index 100% rename from apps/telegram-search/1.1.21/config/init.sql rename to apps/telegram-search/1.1.22/config/init.sql diff --git a/apps/telegram-search/1.1.21/data.yml b/apps/telegram-search/1.1.22/data.yml similarity index 100% rename from apps/telegram-search/1.1.21/data.yml rename to apps/telegram-search/1.1.22/data.yml diff --git a/apps/telegram-search/1.1.21/docker-compose.yml b/apps/telegram-search/1.1.22/docker-compose.yml similarity index 100% rename from apps/telegram-search/1.1.21/docker-compose.yml rename to apps/telegram-search/1.1.22/docker-compose.yml diff --git a/apps/telegram-search/1.1.21/envs/default.env b/apps/telegram-search/1.1.22/envs/default.env similarity index 100% rename from apps/telegram-search/1.1.21/envs/default.env rename to apps/telegram-search/1.1.22/envs/default.env diff --git a/apps/telegram-search/1.1.21/envs/global.env b/apps/telegram-search/1.1.22/envs/global.env similarity index 100% rename from apps/telegram-search/1.1.21/envs/global.env rename to apps/telegram-search/1.1.22/envs/global.env diff --git a/apps/telegram-search/1.1.21/scripts/init.sh b/apps/telegram-search/1.1.22/scripts/init.sh similarity index 100% rename from apps/telegram-search/1.1.21/scripts/init.sh rename to apps/telegram-search/1.1.22/scripts/init.sh diff --git a/apps/telegram-search/1.1.21/scripts/uninstall.sh b/apps/telegram-search/1.1.22/scripts/uninstall.sh similarity index 100% rename from apps/telegram-search/1.1.21/scripts/uninstall.sh rename to apps/telegram-search/1.1.22/scripts/uninstall.sh diff --git a/apps/telegram-search/1.1.21/scripts/upgrade.sh b/apps/telegram-search/1.1.22/scripts/upgrade.sh similarity index 100% rename from apps/telegram-search/1.1.21/scripts/upgrade.sh rename to apps/telegram-search/1.1.22/scripts/upgrade.sh From 60bb518e5e8397e7f21a0bd4d1cde40552af7c1c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Wed, 15 Oct 2025 12:47:08 +0000 Subject: [PATCH 163/262] Processed apps directory via GitHub Actions --- appstore/emby/{4.9.2.3 => 4.9.2.4}/.env | 0 appstore/emby/{4.9.2.3 => 4.9.2.4}/data.yml | 0 appstore/emby/{4.9.2.3 => 4.9.2.4}/docker-compose.yml | 2 +- appstore/emby/{4.9.2.3 => 4.9.2.4}/envs/default.env | 0 appstore/emby/{4.9.2.3 => 4.9.2.4}/envs/global.env | 0 appstore/emby/{4.9.2.3 => 4.9.2.4}/scripts/init.sh | 0 appstore/emby/{4.9.2.3 => 4.9.2.4}/scripts/uninstall.sh | 0 appstore/emby/{4.9.2.3 => 4.9.2.4}/scripts/upgrade.sh | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/.env | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/config/config.yaml | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/config/init.sql | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/data.yml | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/docker-compose.yml | 2 +- appstore/telegram-search/{1.1.21 => 1.1.22}/envs/default.env | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/envs/global.env | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/scripts/init.sh | 0 .../telegram-search/{1.1.21 => 1.1.22}/scripts/uninstall.sh | 0 appstore/telegram-search/{1.1.21 => 1.1.22}/scripts/upgrade.sh | 0 dockge/{emby_4_9_2_3 => emby_4_9_2_4}/.env | 0 dockge/{emby_4_9_2_3 => emby_4_9_2_4}/docker-compose.yml | 2 +- dockge/{emby_4_9_2_3 => emby_4_9_2_4}/envs/default.env | 0 dockge/{emby_4_9_2_3 => emby_4_9_2_4}/envs/global.env | 0 dockge/telegram-search/docker-compose.yml | 2 +- 23 files changed, 4 insertions(+), 4 deletions(-) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/.env (100%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/data.yml (100%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/docker-compose.yml (96%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/envs/default.env (100%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/envs/global.env (100%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/scripts/init.sh (100%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/scripts/uninstall.sh (100%) rename appstore/emby/{4.9.2.3 => 4.9.2.4}/scripts/upgrade.sh (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/.env (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/config/config.yaml (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/config/init.sql (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/data.yml (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/docker-compose.yml (96%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/envs/default.env (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/envs/global.env (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/scripts/init.sh (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/scripts/uninstall.sh (100%) rename appstore/telegram-search/{1.1.21 => 1.1.22}/scripts/upgrade.sh (100%) rename dockge/{emby_4_9_2_3 => emby_4_9_2_4}/.env (100%) rename dockge/{emby_4_9_2_3 => emby_4_9_2_4}/docker-compose.yml (96%) rename dockge/{emby_4_9_2_3 => emby_4_9_2_4}/envs/default.env (100%) rename dockge/{emby_4_9_2_3 => emby_4_9_2_4}/envs/global.env (100%) diff --git a/appstore/emby/4.9.2.3/.env b/appstore/emby/4.9.2.4/.env similarity index 100% rename from appstore/emby/4.9.2.3/.env rename to appstore/emby/4.9.2.4/.env diff --git a/appstore/emby/4.9.2.3/data.yml b/appstore/emby/4.9.2.4/data.yml similarity index 100% rename from appstore/emby/4.9.2.3/data.yml rename to appstore/emby/4.9.2.4/data.yml diff --git a/appstore/emby/4.9.2.3/docker-compose.yml b/appstore/emby/4.9.2.4/docker-compose.yml similarity index 96% rename from appstore/emby/4.9.2.3/docker-compose.yml rename to appstore/emby/4.9.2.4/docker-compose.yml index 91ed00d4e..1e9567477 100644 --- a/appstore/emby/4.9.2.3/docker-compose.yml +++ b/appstore/emby/4.9.2.4/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.3 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/emby/4.9.2.3/envs/default.env b/appstore/emby/4.9.2.4/envs/default.env similarity index 100% rename from appstore/emby/4.9.2.3/envs/default.env rename to appstore/emby/4.9.2.4/envs/default.env diff --git a/appstore/emby/4.9.2.3/envs/global.env b/appstore/emby/4.9.2.4/envs/global.env similarity index 100% rename from appstore/emby/4.9.2.3/envs/global.env rename to appstore/emby/4.9.2.4/envs/global.env diff --git a/appstore/emby/4.9.2.3/scripts/init.sh b/appstore/emby/4.9.2.4/scripts/init.sh similarity index 100% rename from appstore/emby/4.9.2.3/scripts/init.sh rename to appstore/emby/4.9.2.4/scripts/init.sh diff --git a/appstore/emby/4.9.2.3/scripts/uninstall.sh b/appstore/emby/4.9.2.4/scripts/uninstall.sh similarity index 100% rename from appstore/emby/4.9.2.3/scripts/uninstall.sh rename to appstore/emby/4.9.2.4/scripts/uninstall.sh diff --git a/appstore/emby/4.9.2.3/scripts/upgrade.sh b/appstore/emby/4.9.2.4/scripts/upgrade.sh similarity index 100% rename from appstore/emby/4.9.2.3/scripts/upgrade.sh rename to appstore/emby/4.9.2.4/scripts/upgrade.sh diff --git a/appstore/telegram-search/1.1.21/.env b/appstore/telegram-search/1.1.22/.env similarity index 100% rename from appstore/telegram-search/1.1.21/.env rename to appstore/telegram-search/1.1.22/.env diff --git a/appstore/telegram-search/1.1.21/config/config.yaml b/appstore/telegram-search/1.1.22/config/config.yaml similarity index 100% rename from appstore/telegram-search/1.1.21/config/config.yaml rename to appstore/telegram-search/1.1.22/config/config.yaml diff --git a/appstore/telegram-search/1.1.21/config/init.sql b/appstore/telegram-search/1.1.22/config/init.sql similarity index 100% rename from appstore/telegram-search/1.1.21/config/init.sql rename to appstore/telegram-search/1.1.22/config/init.sql diff --git a/appstore/telegram-search/1.1.21/data.yml b/appstore/telegram-search/1.1.22/data.yml similarity index 100% rename from appstore/telegram-search/1.1.21/data.yml rename to appstore/telegram-search/1.1.22/data.yml diff --git a/appstore/telegram-search/1.1.21/docker-compose.yml b/appstore/telegram-search/1.1.22/docker-compose.yml similarity index 96% rename from appstore/telegram-search/1.1.21/docker-compose.yml rename to appstore/telegram-search/1.1.22/docker-compose.yml index 50cbd6814..028b8b3b7 100644 --- a/appstore/telegram-search/1.1.21/docker-compose.yml +++ b/appstore/telegram-search/1.1.22/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - DATABASE_TYPE=postgres - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@telegram_search_pgvector:5432/${POSTGRES_DATABASE} - image: ghcr.io/groupultra/telegram-search:1.1.21 + image: ghcr.io/groupultra/telegram-search:1.1.22 labels: createdBy: Apps networks: diff --git a/appstore/telegram-search/1.1.21/envs/default.env b/appstore/telegram-search/1.1.22/envs/default.env similarity index 100% rename from appstore/telegram-search/1.1.21/envs/default.env rename to appstore/telegram-search/1.1.22/envs/default.env diff --git a/appstore/telegram-search/1.1.21/envs/global.env b/appstore/telegram-search/1.1.22/envs/global.env similarity index 100% rename from appstore/telegram-search/1.1.21/envs/global.env rename to appstore/telegram-search/1.1.22/envs/global.env diff --git a/appstore/telegram-search/1.1.21/scripts/init.sh b/appstore/telegram-search/1.1.22/scripts/init.sh similarity index 100% rename from appstore/telegram-search/1.1.21/scripts/init.sh rename to appstore/telegram-search/1.1.22/scripts/init.sh diff --git a/appstore/telegram-search/1.1.21/scripts/uninstall.sh b/appstore/telegram-search/1.1.22/scripts/uninstall.sh similarity index 100% rename from appstore/telegram-search/1.1.21/scripts/uninstall.sh rename to appstore/telegram-search/1.1.22/scripts/uninstall.sh diff --git a/appstore/telegram-search/1.1.21/scripts/upgrade.sh b/appstore/telegram-search/1.1.22/scripts/upgrade.sh similarity index 100% rename from appstore/telegram-search/1.1.21/scripts/upgrade.sh rename to appstore/telegram-search/1.1.22/scripts/upgrade.sh diff --git a/dockge/emby_4_9_2_3/.env b/dockge/emby_4_9_2_4/.env similarity index 100% rename from dockge/emby_4_9_2_3/.env rename to dockge/emby_4_9_2_4/.env diff --git a/dockge/emby_4_9_2_3/docker-compose.yml b/dockge/emby_4_9_2_4/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_2_3/docker-compose.yml rename to dockge/emby_4_9_2_4/docker-compose.yml index 91ed00d4e..1e9567477 100644 --- a/dockge/emby_4_9_2_3/docker-compose.yml +++ b/dockge/emby_4_9_2_4/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.3 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_3/envs/default.env b/dockge/emby_4_9_2_4/envs/default.env similarity index 100% rename from dockge/emby_4_9_2_3/envs/default.env rename to dockge/emby_4_9_2_4/envs/default.env diff --git a/dockge/emby_4_9_2_3/envs/global.env b/dockge/emby_4_9_2_4/envs/global.env similarity index 100% rename from dockge/emby_4_9_2_3/envs/global.env rename to dockge/emby_4_9_2_4/envs/global.env diff --git a/dockge/telegram-search/docker-compose.yml b/dockge/telegram-search/docker-compose.yml index 50cbd6814..028b8b3b7 100644 --- a/dockge/telegram-search/docker-compose.yml +++ b/dockge/telegram-search/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - DATABASE_TYPE=postgres - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@telegram_search_pgvector:5432/${POSTGRES_DATABASE} - image: ghcr.io/groupultra/telegram-search:1.1.21 + image: ghcr.io/groupultra/telegram-search:1.1.22 labels: createdBy: Apps networks: From e1e9812d2db2d3ce611914955abfb50c7bddbe63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 12:49:44 +0000 Subject: [PATCH 164/262] Update sn0wl1n/ech0 Docker tag to v2.8.3 --- apps/ech0/2.8.2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ech0/2.8.2/docker-compose.yml b/apps/ech0/2.8.2/docker-compose.yml index 69d191c40..9f5c62132 100644 --- a/apps/ech0/2.8.2/docker-compose.yml +++ b/apps/ech0/2.8.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v2.8.2 + image: sn0wl1n/ech0:v2.8.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From e0bd143ba0e37efefcab76541cd820a06650891e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 12:49:49 +0000 Subject: [PATCH 165/262] Update casbin/casdoor Docker tag to v2.86.0 --- apps/casdoor/2.85.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.85.0/docker-compose.yml b/apps/casdoor/2.85.0/docker-compose.yml index 63f2f346d..cc0ed4696 100644 --- a/apps/casdoor/2.85.0/docker-compose.yml +++ b/apps/casdoor/2.85.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.85.0 + image: casbin/casdoor:v2.86.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 976d9ca3cc58ba5a2302a3b830f70ea050c0d3b5 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 12:49:58 +0000 Subject: [PATCH 166/262] Update app version [skip ci] --- apps/ech0/{2.8.2 => 2.8.3}/data.yml | 0 apps/ech0/{2.8.2 => 2.8.3}/docker-compose.yml | 0 apps/ech0/{2.8.2 => 2.8.3}/envs/default.env | 0 apps/ech0/{2.8.2 => 2.8.3}/envs/global.env | 0 apps/ech0/{2.8.2 => 2.8.3}/scripts/init.sh | 0 apps/ech0/{2.8.2 => 2.8.3}/scripts/uninstall.sh | 0 apps/ech0/{2.8.2 => 2.8.3}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ech0/{2.8.2 => 2.8.3}/data.yml (100%) rename apps/ech0/{2.8.2 => 2.8.3}/docker-compose.yml (100%) rename apps/ech0/{2.8.2 => 2.8.3}/envs/default.env (100%) rename apps/ech0/{2.8.2 => 2.8.3}/envs/global.env (100%) rename apps/ech0/{2.8.2 => 2.8.3}/scripts/init.sh (100%) rename apps/ech0/{2.8.2 => 2.8.3}/scripts/uninstall.sh (100%) rename apps/ech0/{2.8.2 => 2.8.3}/scripts/upgrade.sh (100%) diff --git a/apps/ech0/2.8.2/data.yml b/apps/ech0/2.8.3/data.yml similarity index 100% rename from apps/ech0/2.8.2/data.yml rename to apps/ech0/2.8.3/data.yml diff --git a/apps/ech0/2.8.2/docker-compose.yml b/apps/ech0/2.8.3/docker-compose.yml similarity index 100% rename from apps/ech0/2.8.2/docker-compose.yml rename to apps/ech0/2.8.3/docker-compose.yml diff --git a/apps/ech0/2.8.2/envs/default.env b/apps/ech0/2.8.3/envs/default.env similarity index 100% rename from apps/ech0/2.8.2/envs/default.env rename to apps/ech0/2.8.3/envs/default.env diff --git a/apps/ech0/2.8.2/envs/global.env b/apps/ech0/2.8.3/envs/global.env similarity index 100% rename from apps/ech0/2.8.2/envs/global.env rename to apps/ech0/2.8.3/envs/global.env diff --git a/apps/ech0/2.8.2/scripts/init.sh b/apps/ech0/2.8.3/scripts/init.sh similarity index 100% rename from apps/ech0/2.8.2/scripts/init.sh rename to apps/ech0/2.8.3/scripts/init.sh diff --git a/apps/ech0/2.8.2/scripts/uninstall.sh b/apps/ech0/2.8.3/scripts/uninstall.sh similarity index 100% rename from apps/ech0/2.8.2/scripts/uninstall.sh rename to apps/ech0/2.8.3/scripts/uninstall.sh diff --git a/apps/ech0/2.8.2/scripts/upgrade.sh b/apps/ech0/2.8.3/scripts/upgrade.sh similarity index 100% rename from apps/ech0/2.8.2/scripts/upgrade.sh rename to apps/ech0/2.8.3/scripts/upgrade.sh From 5a64ce9c1eb764d91e732abee2401b59ecdc4859 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 12:50:02 +0000 Subject: [PATCH 167/262] Update app version [skip ci] --- apps/casdoor/{2.85.0 => 2.86.0}/config/init_data.json | 0 apps/casdoor/{2.85.0 => 2.86.0}/data.yml | 0 apps/casdoor/{2.85.0 => 2.86.0}/docker-compose.yml | 0 apps/casdoor/{2.85.0 => 2.86.0}/envs/casdoor.env | 0 apps/casdoor/{2.85.0 => 2.86.0}/envs/default.env | 0 apps/casdoor/{2.85.0 => 2.86.0}/envs/global.env | 0 apps/casdoor/{2.85.0 => 2.86.0}/scripts/init.sh | 0 apps/casdoor/{2.85.0 => 2.86.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.85.0 => 2.86.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.85.0 => 2.86.0}/config/init_data.json (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/data.yml (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/docker-compose.yml (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/envs/default.env (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/envs/global.env (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/scripts/init.sh (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.85.0 => 2.86.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.85.0/config/init_data.json b/apps/casdoor/2.86.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.85.0/config/init_data.json rename to apps/casdoor/2.86.0/config/init_data.json diff --git a/apps/casdoor/2.85.0/data.yml b/apps/casdoor/2.86.0/data.yml similarity index 100% rename from apps/casdoor/2.85.0/data.yml rename to apps/casdoor/2.86.0/data.yml diff --git a/apps/casdoor/2.85.0/docker-compose.yml b/apps/casdoor/2.86.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.85.0/docker-compose.yml rename to apps/casdoor/2.86.0/docker-compose.yml diff --git a/apps/casdoor/2.85.0/envs/casdoor.env b/apps/casdoor/2.86.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.85.0/envs/casdoor.env rename to apps/casdoor/2.86.0/envs/casdoor.env diff --git a/apps/casdoor/2.85.0/envs/default.env b/apps/casdoor/2.86.0/envs/default.env similarity index 100% rename from apps/casdoor/2.85.0/envs/default.env rename to apps/casdoor/2.86.0/envs/default.env diff --git a/apps/casdoor/2.85.0/envs/global.env b/apps/casdoor/2.86.0/envs/global.env similarity index 100% rename from apps/casdoor/2.85.0/envs/global.env rename to apps/casdoor/2.86.0/envs/global.env diff --git a/apps/casdoor/2.85.0/scripts/init.sh b/apps/casdoor/2.86.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.85.0/scripts/init.sh rename to apps/casdoor/2.86.0/scripts/init.sh diff --git a/apps/casdoor/2.85.0/scripts/uninstall.sh b/apps/casdoor/2.86.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.85.0/scripts/uninstall.sh rename to apps/casdoor/2.86.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.85.0/scripts/upgrade.sh b/apps/casdoor/2.86.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.85.0/scripts/upgrade.sh rename to apps/casdoor/2.86.0/scripts/upgrade.sh From 9b892267dcadef499cec5034edb09d38d43e676d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 13:34:38 +0000 Subject: [PATCH 168/262] Update johannesjo/super-productivity Docker tag to v15.3.0 --- apps/super-productivity/15.2.16/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/super-productivity/15.2.16/docker-compose.yml b/apps/super-productivity/15.2.16/docker-compose.yml index 7e3431057..94f608779 100644 --- a/apps/super-productivity/15.2.16/docker-compose.yml +++ b/apps/super-productivity/15.2.16/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: super-productivity: - image: johannesjo/super-productivity:v15.2.16 + image: johannesjo/super-productivity:v15.3.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From aa3d0efbfbf1af9080a8961ae08f5175a0a665c8 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 13:34:50 +0000 Subject: [PATCH 169/262] Update app version [skip ci] --- apps/super-productivity/{15.2.16 => 15.3.0}/conf/webdav.yaml | 0 apps/super-productivity/{15.2.16 => 15.3.0}/data.yml | 0 apps/super-productivity/{15.2.16 => 15.3.0}/docker-compose.yml | 0 apps/super-productivity/{15.2.16 => 15.3.0}/envs/default.env | 0 apps/super-productivity/{15.2.16 => 15.3.0}/envs/global.env | 0 apps/super-productivity/{15.2.16 => 15.3.0}/scripts/init.sh | 0 apps/super-productivity/{15.2.16 => 15.3.0}/scripts/uninstall.sh | 0 apps/super-productivity/{15.2.16 => 15.3.0}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/super-productivity/{15.2.16 => 15.3.0}/conf/webdav.yaml (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/data.yml (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/docker-compose.yml (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/envs/default.env (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/envs/global.env (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/scripts/init.sh (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/scripts/uninstall.sh (100%) rename apps/super-productivity/{15.2.16 => 15.3.0}/scripts/upgrade.sh (100%) diff --git a/apps/super-productivity/15.2.16/conf/webdav.yaml b/apps/super-productivity/15.3.0/conf/webdav.yaml similarity index 100% rename from apps/super-productivity/15.2.16/conf/webdav.yaml rename to apps/super-productivity/15.3.0/conf/webdav.yaml diff --git a/apps/super-productivity/15.2.16/data.yml b/apps/super-productivity/15.3.0/data.yml similarity index 100% rename from apps/super-productivity/15.2.16/data.yml rename to apps/super-productivity/15.3.0/data.yml diff --git a/apps/super-productivity/15.2.16/docker-compose.yml b/apps/super-productivity/15.3.0/docker-compose.yml similarity index 100% rename from apps/super-productivity/15.2.16/docker-compose.yml rename to apps/super-productivity/15.3.0/docker-compose.yml diff --git a/apps/super-productivity/15.2.16/envs/default.env b/apps/super-productivity/15.3.0/envs/default.env similarity index 100% rename from apps/super-productivity/15.2.16/envs/default.env rename to apps/super-productivity/15.3.0/envs/default.env diff --git a/apps/super-productivity/15.2.16/envs/global.env b/apps/super-productivity/15.3.0/envs/global.env similarity index 100% rename from apps/super-productivity/15.2.16/envs/global.env rename to apps/super-productivity/15.3.0/envs/global.env diff --git a/apps/super-productivity/15.2.16/scripts/init.sh b/apps/super-productivity/15.3.0/scripts/init.sh similarity index 100% rename from apps/super-productivity/15.2.16/scripts/init.sh rename to apps/super-productivity/15.3.0/scripts/init.sh diff --git a/apps/super-productivity/15.2.16/scripts/uninstall.sh b/apps/super-productivity/15.3.0/scripts/uninstall.sh similarity index 100% rename from apps/super-productivity/15.2.16/scripts/uninstall.sh rename to apps/super-productivity/15.3.0/scripts/uninstall.sh diff --git a/apps/super-productivity/15.2.16/scripts/upgrade.sh b/apps/super-productivity/15.3.0/scripts/upgrade.sh similarity index 100% rename from apps/super-productivity/15.2.16/scripts/upgrade.sh rename to apps/super-productivity/15.3.0/scripts/upgrade.sh From bace03ce801928ee4edfb90da4c356727a8590cc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 13:34:54 +0000 Subject: [PATCH 170/262] Update uusec/openresty-manager Docker tag to v2.4.0 --- apps/openresty-manager/2.3.7/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openresty-manager/2.3.7/docker-compose.yml b/apps/openresty-manager/2.3.7/docker-compose.yml index b6e85cda1..50c55470a 100644 --- a/apps/openresty-manager/2.3.7/docker-compose.yml +++ b/apps/openresty-manager/2.3.7/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: openresty-manager: - image: uusec/openresty-manager:2.3.7 + image: uusec/openresty-manager:2.4.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 49d1d011e9a860ba06da1f13fac07cecb1564c96 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 13:35:05 +0000 Subject: [PATCH 171/262] Update app version [skip ci] --- apps/openresty-manager/{2.3.7 => 2.4.0}/data.yml | 0 apps/openresty-manager/{2.3.7 => 2.4.0}/docker-compose.yml | 0 apps/openresty-manager/{2.3.7 => 2.4.0}/envs/default.env | 0 apps/openresty-manager/{2.3.7 => 2.4.0}/envs/global.env | 0 apps/openresty-manager/{2.3.7 => 2.4.0}/scripts/init.sh | 0 apps/openresty-manager/{2.3.7 => 2.4.0}/scripts/uninstall.sh | 0 apps/openresty-manager/{2.3.7 => 2.4.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/openresty-manager/{2.3.7 => 2.4.0}/data.yml (100%) rename apps/openresty-manager/{2.3.7 => 2.4.0}/docker-compose.yml (100%) rename apps/openresty-manager/{2.3.7 => 2.4.0}/envs/default.env (100%) rename apps/openresty-manager/{2.3.7 => 2.4.0}/envs/global.env (100%) rename apps/openresty-manager/{2.3.7 => 2.4.0}/scripts/init.sh (100%) rename apps/openresty-manager/{2.3.7 => 2.4.0}/scripts/uninstall.sh (100%) rename apps/openresty-manager/{2.3.7 => 2.4.0}/scripts/upgrade.sh (100%) diff --git a/apps/openresty-manager/2.3.7/data.yml b/apps/openresty-manager/2.4.0/data.yml similarity index 100% rename from apps/openresty-manager/2.3.7/data.yml rename to apps/openresty-manager/2.4.0/data.yml diff --git a/apps/openresty-manager/2.3.7/docker-compose.yml b/apps/openresty-manager/2.4.0/docker-compose.yml similarity index 100% rename from apps/openresty-manager/2.3.7/docker-compose.yml rename to apps/openresty-manager/2.4.0/docker-compose.yml diff --git a/apps/openresty-manager/2.3.7/envs/default.env b/apps/openresty-manager/2.4.0/envs/default.env similarity index 100% rename from apps/openresty-manager/2.3.7/envs/default.env rename to apps/openresty-manager/2.4.0/envs/default.env diff --git a/apps/openresty-manager/2.3.7/envs/global.env b/apps/openresty-manager/2.4.0/envs/global.env similarity index 100% rename from apps/openresty-manager/2.3.7/envs/global.env rename to apps/openresty-manager/2.4.0/envs/global.env diff --git a/apps/openresty-manager/2.3.7/scripts/init.sh b/apps/openresty-manager/2.4.0/scripts/init.sh similarity index 100% rename from apps/openresty-manager/2.3.7/scripts/init.sh rename to apps/openresty-manager/2.4.0/scripts/init.sh diff --git a/apps/openresty-manager/2.3.7/scripts/uninstall.sh b/apps/openresty-manager/2.4.0/scripts/uninstall.sh similarity index 100% rename from apps/openresty-manager/2.3.7/scripts/uninstall.sh rename to apps/openresty-manager/2.4.0/scripts/uninstall.sh diff --git a/apps/openresty-manager/2.3.7/scripts/upgrade.sh b/apps/openresty-manager/2.4.0/scripts/upgrade.sh similarity index 100% rename from apps/openresty-manager/2.3.7/scripts/upgrade.sh rename to apps/openresty-manager/2.4.0/scripts/upgrade.sh From 1bf3efa8eb7dfba4f7ca33ca095d037a2c807ffe Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Wed, 15 Oct 2025 15:20:26 +0000 Subject: [PATCH 172/262] Processed apps directory via GitHub Actions --- appstore/casdoor/{2.85.0 => 2.86.0}/.env | 0 appstore/casdoor/{2.85.0 => 2.86.0}/config/init_data.json | 0 appstore/casdoor/{2.85.0 => 2.86.0}/data.yml | 0 appstore/casdoor/{2.85.0 => 2.86.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.85.0 => 2.86.0}/envs/casdoor.env | 0 appstore/casdoor/{2.85.0 => 2.86.0}/envs/default.env | 0 appstore/casdoor/{2.85.0 => 2.86.0}/envs/global.env | 0 appstore/casdoor/{2.85.0 => 2.86.0}/scripts/init.sh | 0 appstore/casdoor/{2.85.0 => 2.86.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.85.0 => 2.86.0}/scripts/upgrade.sh | 0 appstore/ech0/{2.8.2 => 2.8.3}/.env | 0 appstore/ech0/{2.8.2 => 2.8.3}/data.yml | 0 appstore/ech0/{2.8.2 => 2.8.3}/docker-compose.yml | 2 +- appstore/ech0/{2.8.2 => 2.8.3}/envs/default.env | 0 appstore/ech0/{2.8.2 => 2.8.3}/envs/global.env | 0 appstore/ech0/{2.8.2 => 2.8.3}/scripts/init.sh | 0 appstore/ech0/{2.8.2 => 2.8.3}/scripts/uninstall.sh | 0 appstore/ech0/{2.8.2 => 2.8.3}/scripts/upgrade.sh | 0 appstore/openresty-manager/{2.3.7 => 2.4.0}/.env | 0 appstore/openresty-manager/{2.3.7 => 2.4.0}/data.yml | 0 appstore/openresty-manager/{2.3.7 => 2.4.0}/docker-compose.yml | 2 +- appstore/openresty-manager/{2.3.7 => 2.4.0}/envs/default.env | 0 appstore/openresty-manager/{2.3.7 => 2.4.0}/envs/global.env | 0 appstore/openresty-manager/{2.3.7 => 2.4.0}/scripts/init.sh | 0 .../openresty-manager/{2.3.7 => 2.4.0}/scripts/uninstall.sh | 0 appstore/openresty-manager/{2.3.7 => 2.4.0}/scripts/upgrade.sh | 0 appstore/super-productivity/{15.2.16 => 15.3.0}/.env | 0 .../super-productivity/{15.2.16 => 15.3.0}/conf/webdav.yaml | 0 appstore/super-productivity/{15.2.16 => 15.3.0}/data.yml | 0 .../super-productivity/{15.2.16 => 15.3.0}/docker-compose.yml | 2 +- .../super-productivity/{15.2.16 => 15.3.0}/envs/default.env | 0 appstore/super-productivity/{15.2.16 => 15.3.0}/envs/global.env | 0 appstore/super-productivity/{15.2.16 => 15.3.0}/scripts/init.sh | 0 .../super-productivity/{15.2.16 => 15.3.0}/scripts/uninstall.sh | 0 .../super-productivity/{15.2.16 => 15.3.0}/scripts/upgrade.sh | 0 dockge/casdoor/docker-compose.yml | 2 +- dockge/ech0/docker-compose.yml | 2 +- dockge/openresty-manager/docker-compose.yml | 2 +- dockge/super-productivity/docker-compose.yml | 2 +- 39 files changed, 8 insertions(+), 8 deletions(-) rename appstore/casdoor/{2.85.0 => 2.86.0}/.env (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/config/init_data.json (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/data.yml (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.85.0 => 2.86.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/envs/default.env (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/envs/global.env (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.85.0 => 2.86.0}/scripts/upgrade.sh (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/.env (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/data.yml (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/docker-compose.yml (93%) rename appstore/ech0/{2.8.2 => 2.8.3}/envs/default.env (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/envs/global.env (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/scripts/init.sh (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/scripts/uninstall.sh (100%) rename appstore/ech0/{2.8.2 => 2.8.3}/scripts/upgrade.sh (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/.env (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/data.yml (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/docker-compose.yml (94%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/envs/default.env (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/envs/global.env (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/scripts/init.sh (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/scripts/uninstall.sh (100%) rename appstore/openresty-manager/{2.3.7 => 2.4.0}/scripts/upgrade.sh (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/.env (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/conf/webdav.yaml (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/data.yml (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/docker-compose.yml (92%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/envs/default.env (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/envs/global.env (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/scripts/init.sh (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/scripts/uninstall.sh (100%) rename appstore/super-productivity/{15.2.16 => 15.3.0}/scripts/upgrade.sh (100%) diff --git a/appstore/casdoor/2.85.0/.env b/appstore/casdoor/2.86.0/.env similarity index 100% rename from appstore/casdoor/2.85.0/.env rename to appstore/casdoor/2.86.0/.env diff --git a/appstore/casdoor/2.85.0/config/init_data.json b/appstore/casdoor/2.86.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.85.0/config/init_data.json rename to appstore/casdoor/2.86.0/config/init_data.json diff --git a/appstore/casdoor/2.85.0/data.yml b/appstore/casdoor/2.86.0/data.yml similarity index 100% rename from appstore/casdoor/2.85.0/data.yml rename to appstore/casdoor/2.86.0/data.yml diff --git a/appstore/casdoor/2.85.0/docker-compose.yml b/appstore/casdoor/2.86.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.85.0/docker-compose.yml rename to appstore/casdoor/2.86.0/docker-compose.yml index d2f4a851b..a514b20af 100644 --- a/appstore/casdoor/2.85.0/docker-compose.yml +++ b/appstore/casdoor/2.86.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.85.0 + image: casbin/casdoor:v2.86.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.85.0/envs/casdoor.env b/appstore/casdoor/2.86.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.85.0/envs/casdoor.env rename to appstore/casdoor/2.86.0/envs/casdoor.env diff --git a/appstore/casdoor/2.85.0/envs/default.env b/appstore/casdoor/2.86.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.85.0/envs/default.env rename to appstore/casdoor/2.86.0/envs/default.env diff --git a/appstore/casdoor/2.85.0/envs/global.env b/appstore/casdoor/2.86.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.85.0/envs/global.env rename to appstore/casdoor/2.86.0/envs/global.env diff --git a/appstore/casdoor/2.85.0/scripts/init.sh b/appstore/casdoor/2.86.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.85.0/scripts/init.sh rename to appstore/casdoor/2.86.0/scripts/init.sh diff --git a/appstore/casdoor/2.85.0/scripts/uninstall.sh b/appstore/casdoor/2.86.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.85.0/scripts/uninstall.sh rename to appstore/casdoor/2.86.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.85.0/scripts/upgrade.sh b/appstore/casdoor/2.86.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.85.0/scripts/upgrade.sh rename to appstore/casdoor/2.86.0/scripts/upgrade.sh diff --git a/appstore/ech0/2.8.2/.env b/appstore/ech0/2.8.3/.env similarity index 100% rename from appstore/ech0/2.8.2/.env rename to appstore/ech0/2.8.3/.env diff --git a/appstore/ech0/2.8.2/data.yml b/appstore/ech0/2.8.3/data.yml similarity index 100% rename from appstore/ech0/2.8.2/data.yml rename to appstore/ech0/2.8.3/data.yml diff --git a/appstore/ech0/2.8.2/docker-compose.yml b/appstore/ech0/2.8.3/docker-compose.yml similarity index 93% rename from appstore/ech0/2.8.2/docker-compose.yml rename to appstore/ech0/2.8.3/docker-compose.yml index bc50539ea..64c86cad1 100644 --- a/appstore/ech0/2.8.2/docker-compose.yml +++ b/appstore/ech0/2.8.3/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.8.2 + image: sn0wl1n/ech0:v2.8.3 labels: createdBy: Apps networks: diff --git a/appstore/ech0/2.8.2/envs/default.env b/appstore/ech0/2.8.3/envs/default.env similarity index 100% rename from appstore/ech0/2.8.2/envs/default.env rename to appstore/ech0/2.8.3/envs/default.env diff --git a/appstore/ech0/2.8.2/envs/global.env b/appstore/ech0/2.8.3/envs/global.env similarity index 100% rename from appstore/ech0/2.8.2/envs/global.env rename to appstore/ech0/2.8.3/envs/global.env diff --git a/appstore/ech0/2.8.2/scripts/init.sh b/appstore/ech0/2.8.3/scripts/init.sh similarity index 100% rename from appstore/ech0/2.8.2/scripts/init.sh rename to appstore/ech0/2.8.3/scripts/init.sh diff --git a/appstore/ech0/2.8.2/scripts/uninstall.sh b/appstore/ech0/2.8.3/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/2.8.2/scripts/uninstall.sh rename to appstore/ech0/2.8.3/scripts/uninstall.sh diff --git a/appstore/ech0/2.8.2/scripts/upgrade.sh b/appstore/ech0/2.8.3/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/2.8.2/scripts/upgrade.sh rename to appstore/ech0/2.8.3/scripts/upgrade.sh diff --git a/appstore/openresty-manager/2.3.7/.env b/appstore/openresty-manager/2.4.0/.env similarity index 100% rename from appstore/openresty-manager/2.3.7/.env rename to appstore/openresty-manager/2.4.0/.env diff --git a/appstore/openresty-manager/2.3.7/data.yml b/appstore/openresty-manager/2.4.0/data.yml similarity index 100% rename from appstore/openresty-manager/2.3.7/data.yml rename to appstore/openresty-manager/2.4.0/data.yml diff --git a/appstore/openresty-manager/2.3.7/docker-compose.yml b/appstore/openresty-manager/2.4.0/docker-compose.yml similarity index 94% rename from appstore/openresty-manager/2.3.7/docker-compose.yml rename to appstore/openresty-manager/2.4.0/docker-compose.yml index 22b3a0893..6f3c3d93c 100644 --- a/appstore/openresty-manager/2.3.7/docker-compose.yml +++ b/appstore/openresty-manager/2.4.0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: uusec/openresty-manager:2.3.7 + image: uusec/openresty-manager:2.4.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/openresty-manager/2.3.7/envs/default.env b/appstore/openresty-manager/2.4.0/envs/default.env similarity index 100% rename from appstore/openresty-manager/2.3.7/envs/default.env rename to appstore/openresty-manager/2.4.0/envs/default.env diff --git a/appstore/openresty-manager/2.3.7/envs/global.env b/appstore/openresty-manager/2.4.0/envs/global.env similarity index 100% rename from appstore/openresty-manager/2.3.7/envs/global.env rename to appstore/openresty-manager/2.4.0/envs/global.env diff --git a/appstore/openresty-manager/2.3.7/scripts/init.sh b/appstore/openresty-manager/2.4.0/scripts/init.sh similarity index 100% rename from appstore/openresty-manager/2.3.7/scripts/init.sh rename to appstore/openresty-manager/2.4.0/scripts/init.sh diff --git a/appstore/openresty-manager/2.3.7/scripts/uninstall.sh b/appstore/openresty-manager/2.4.0/scripts/uninstall.sh similarity index 100% rename from appstore/openresty-manager/2.3.7/scripts/uninstall.sh rename to appstore/openresty-manager/2.4.0/scripts/uninstall.sh diff --git a/appstore/openresty-manager/2.3.7/scripts/upgrade.sh b/appstore/openresty-manager/2.4.0/scripts/upgrade.sh similarity index 100% rename from appstore/openresty-manager/2.3.7/scripts/upgrade.sh rename to appstore/openresty-manager/2.4.0/scripts/upgrade.sh diff --git a/appstore/super-productivity/15.2.16/.env b/appstore/super-productivity/15.3.0/.env similarity index 100% rename from appstore/super-productivity/15.2.16/.env rename to appstore/super-productivity/15.3.0/.env diff --git a/appstore/super-productivity/15.2.16/conf/webdav.yaml b/appstore/super-productivity/15.3.0/conf/webdav.yaml similarity index 100% rename from appstore/super-productivity/15.2.16/conf/webdav.yaml rename to appstore/super-productivity/15.3.0/conf/webdav.yaml diff --git a/appstore/super-productivity/15.2.16/data.yml b/appstore/super-productivity/15.3.0/data.yml similarity index 100% rename from appstore/super-productivity/15.2.16/data.yml rename to appstore/super-productivity/15.3.0/data.yml diff --git a/appstore/super-productivity/15.2.16/docker-compose.yml b/appstore/super-productivity/15.3.0/docker-compose.yml similarity index 92% rename from appstore/super-productivity/15.2.16/docker-compose.yml rename to appstore/super-productivity/15.3.0/docker-compose.yml index 45baca04d..9bed149d6 100644 --- a/appstore/super-productivity/15.2.16/docker-compose.yml +++ b/appstore/super-productivity/15.3.0/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.2.16 + image: johannesjo/super-productivity:v15.3.0 labels: createdBy: Apps networks: diff --git a/appstore/super-productivity/15.2.16/envs/default.env b/appstore/super-productivity/15.3.0/envs/default.env similarity index 100% rename from appstore/super-productivity/15.2.16/envs/default.env rename to appstore/super-productivity/15.3.0/envs/default.env diff --git a/appstore/super-productivity/15.2.16/envs/global.env b/appstore/super-productivity/15.3.0/envs/global.env similarity index 100% rename from appstore/super-productivity/15.2.16/envs/global.env rename to appstore/super-productivity/15.3.0/envs/global.env diff --git a/appstore/super-productivity/15.2.16/scripts/init.sh b/appstore/super-productivity/15.3.0/scripts/init.sh similarity index 100% rename from appstore/super-productivity/15.2.16/scripts/init.sh rename to appstore/super-productivity/15.3.0/scripts/init.sh diff --git a/appstore/super-productivity/15.2.16/scripts/uninstall.sh b/appstore/super-productivity/15.3.0/scripts/uninstall.sh similarity index 100% rename from appstore/super-productivity/15.2.16/scripts/uninstall.sh rename to appstore/super-productivity/15.3.0/scripts/uninstall.sh diff --git a/appstore/super-productivity/15.2.16/scripts/upgrade.sh b/appstore/super-productivity/15.3.0/scripts/upgrade.sh similarity index 100% rename from appstore/super-productivity/15.2.16/scripts/upgrade.sh rename to appstore/super-productivity/15.3.0/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index d2f4a851b..a514b20af 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.85.0 + image: casbin/casdoor:v2.86.0 labels: createdBy: Apps networks: diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index bc50539ea..64c86cad1 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sn0wl1n/ech0:v2.8.2 + image: sn0wl1n/ech0:v2.8.3 labels: createdBy: Apps networks: diff --git a/dockge/openresty-manager/docker-compose.yml b/dockge/openresty-manager/docker-compose.yml index 22b3a0893..6f3c3d93c 100644 --- a/dockge/openresty-manager/docker-compose.yml +++ b/dockge/openresty-manager/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: uusec/openresty-manager:2.3.7 + image: uusec/openresty-manager:2.4.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/super-productivity/docker-compose.yml b/dockge/super-productivity/docker-compose.yml index 45baca04d..9bed149d6 100644 --- a/dockge/super-productivity/docker-compose.yml +++ b/dockge/super-productivity/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v15.2.16 + image: johannesjo/super-productivity:v15.3.0 labels: createdBy: Apps networks: From 95fa705579c3dbe3c03dea3332a59bb5a71af29e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 15:22:54 +0000 Subject: [PATCH 173/262] Update mlikiowa/napcat-docker Docker tag to v4.8.121 --- apps/astrbot-napcat/4.8.120/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/astrbot-napcat/4.8.120/docker-compose.yml b/apps/astrbot-napcat/4.8.120/docker-compose.yml index a9a641c82..7538e9ba1 100644 --- a/apps/astrbot-napcat/4.8.120/docker-compose.yml +++ b/apps/astrbot-napcat/4.8.120/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: napcat: - image: mlikiowa/napcat-docker:v4.8.120 + image: mlikiowa/napcat-docker:v4.8.121 container_name: napcat-${CONTAINER_NAME} restart: always networks: From 4f2da57a6caff973fbe675fde89c5c461e7044e9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 15:23:06 +0000 Subject: [PATCH 174/262] Update app version [skip ci] --- apps/astrbot-napcat/{4.8.120 => 4.8.121}/data.yml | 0 apps/astrbot-napcat/{4.8.120 => 4.8.121}/docker-compose.yml | 0 apps/astrbot-napcat/{4.8.120 => 4.8.121}/envs/default.env | 0 apps/astrbot-napcat/{4.8.120 => 4.8.121}/envs/global.env | 0 apps/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/init.sh | 0 apps/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/uninstall.sh | 0 apps/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/data.yml (100%) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/docker-compose.yml (100%) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/envs/default.env (100%) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/envs/global.env (100%) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/init.sh (100%) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/uninstall.sh (100%) rename apps/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/upgrade.sh (100%) diff --git a/apps/astrbot-napcat/4.8.120/data.yml b/apps/astrbot-napcat/4.8.121/data.yml similarity index 100% rename from apps/astrbot-napcat/4.8.120/data.yml rename to apps/astrbot-napcat/4.8.121/data.yml diff --git a/apps/astrbot-napcat/4.8.120/docker-compose.yml b/apps/astrbot-napcat/4.8.121/docker-compose.yml similarity index 100% rename from apps/astrbot-napcat/4.8.120/docker-compose.yml rename to apps/astrbot-napcat/4.8.121/docker-compose.yml diff --git a/apps/astrbot-napcat/4.8.120/envs/default.env b/apps/astrbot-napcat/4.8.121/envs/default.env similarity index 100% rename from apps/astrbot-napcat/4.8.120/envs/default.env rename to apps/astrbot-napcat/4.8.121/envs/default.env diff --git a/apps/astrbot-napcat/4.8.120/envs/global.env b/apps/astrbot-napcat/4.8.121/envs/global.env similarity index 100% rename from apps/astrbot-napcat/4.8.120/envs/global.env rename to apps/astrbot-napcat/4.8.121/envs/global.env diff --git a/apps/astrbot-napcat/4.8.120/scripts/init.sh b/apps/astrbot-napcat/4.8.121/scripts/init.sh similarity index 100% rename from apps/astrbot-napcat/4.8.120/scripts/init.sh rename to apps/astrbot-napcat/4.8.121/scripts/init.sh diff --git a/apps/astrbot-napcat/4.8.120/scripts/uninstall.sh b/apps/astrbot-napcat/4.8.121/scripts/uninstall.sh similarity index 100% rename from apps/astrbot-napcat/4.8.120/scripts/uninstall.sh rename to apps/astrbot-napcat/4.8.121/scripts/uninstall.sh diff --git a/apps/astrbot-napcat/4.8.120/scripts/upgrade.sh b/apps/astrbot-napcat/4.8.121/scripts/upgrade.sh similarity index 100% rename from apps/astrbot-napcat/4.8.120/scripts/upgrade.sh rename to apps/astrbot-napcat/4.8.121/scripts/upgrade.sh From 80b2c1ba5fc13faee8932ae3dfe5bfcfd775c2e8 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Wed, 15 Oct 2025 18:32:11 +0000 Subject: [PATCH 175/262] Processed apps directory via GitHub Actions --- appstore/astrbot-napcat/{4.8.120 => 4.8.121}/.env | 0 appstore/astrbot-napcat/{4.8.120 => 4.8.121}/data.yml | 0 appstore/astrbot-napcat/{4.8.120 => 4.8.121}/docker-compose.yml | 2 +- appstore/astrbot-napcat/{4.8.120 => 4.8.121}/envs/default.env | 0 appstore/astrbot-napcat/{4.8.120 => 4.8.121}/envs/global.env | 0 appstore/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/init.sh | 0 .../astrbot-napcat/{4.8.120 => 4.8.121}/scripts/uninstall.sh | 0 appstore/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/upgrade.sh | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/.env (100%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/data.yml (100%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/docker-compose.yml (96%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/envs/default.env (100%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/envs/global.env (100%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/init.sh (100%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/uninstall.sh (100%) rename appstore/astrbot-napcat/{4.8.120 => 4.8.121}/scripts/upgrade.sh (100%) diff --git a/appstore/astrbot-napcat/4.8.120/.env b/appstore/astrbot-napcat/4.8.121/.env similarity index 100% rename from appstore/astrbot-napcat/4.8.120/.env rename to appstore/astrbot-napcat/4.8.121/.env diff --git a/appstore/astrbot-napcat/4.8.120/data.yml b/appstore/astrbot-napcat/4.8.121/data.yml similarity index 100% rename from appstore/astrbot-napcat/4.8.120/data.yml rename to appstore/astrbot-napcat/4.8.121/data.yml diff --git a/appstore/astrbot-napcat/4.8.120/docker-compose.yml b/appstore/astrbot-napcat/4.8.121/docker-compose.yml similarity index 96% rename from appstore/astrbot-napcat/4.8.120/docker-compose.yml rename to appstore/astrbot-napcat/4.8.121/docker-compose.yml index 5f9fd2a59..c022ffc91 100644 --- a/appstore/astrbot-napcat/4.8.120/docker-compose.yml +++ b/appstore/astrbot-napcat/4.8.121/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.120 + image: mlikiowa/napcat-docker:v4.8.121 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/appstore/astrbot-napcat/4.8.120/envs/default.env b/appstore/astrbot-napcat/4.8.121/envs/default.env similarity index 100% rename from appstore/astrbot-napcat/4.8.120/envs/default.env rename to appstore/astrbot-napcat/4.8.121/envs/default.env diff --git a/appstore/astrbot-napcat/4.8.120/envs/global.env b/appstore/astrbot-napcat/4.8.121/envs/global.env similarity index 100% rename from appstore/astrbot-napcat/4.8.120/envs/global.env rename to appstore/astrbot-napcat/4.8.121/envs/global.env diff --git a/appstore/astrbot-napcat/4.8.120/scripts/init.sh b/appstore/astrbot-napcat/4.8.121/scripts/init.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.120/scripts/init.sh rename to appstore/astrbot-napcat/4.8.121/scripts/init.sh diff --git a/appstore/astrbot-napcat/4.8.120/scripts/uninstall.sh b/appstore/astrbot-napcat/4.8.121/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.120/scripts/uninstall.sh rename to appstore/astrbot-napcat/4.8.121/scripts/uninstall.sh diff --git a/appstore/astrbot-napcat/4.8.120/scripts/upgrade.sh b/appstore/astrbot-napcat/4.8.121/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.120/scripts/upgrade.sh rename to appstore/astrbot-napcat/4.8.121/scripts/upgrade.sh diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index 5f9fd2a59..c022ffc91 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.120 + image: mlikiowa/napcat-docker:v4.8.121 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network From 91cb0558a6e6973bf147c4d8ba56b5db47a07212 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 22:27:30 +0000 Subject: [PATCH 176/262] Update dockurr/macos Docker tag to v2.24 --- apps/macos/2.23/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/macos/2.23/docker-compose.yml b/apps/macos/2.23/docker-compose.yml index ff579d35c..c04bfdefd 100644 --- a/apps/macos/2.23/docker-compose.yml +++ b/apps/macos/2.23/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: windows: - image: dockurr/macos:2.23 + image: dockurr/macos:2.24 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 4badf4dbff8202b16cd03d24439441190112632b Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 22:27:43 +0000 Subject: [PATCH 177/262] Update app version [skip ci] --- apps/macos/{2.23 => 2.24}/data.yml | 0 apps/macos/{2.23 => 2.24}/docker-compose.yml | 0 apps/macos/{2.23 => 2.24}/envs/default.env | 0 apps/macos/{2.23 => 2.24}/envs/global.env | 0 apps/macos/{2.23 => 2.24}/scripts/init.sh | 0 apps/macos/{2.23 => 2.24}/scripts/uninstall.sh | 0 apps/macos/{2.23 => 2.24}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/macos/{2.23 => 2.24}/data.yml (100%) rename apps/macos/{2.23 => 2.24}/docker-compose.yml (100%) rename apps/macos/{2.23 => 2.24}/envs/default.env (100%) rename apps/macos/{2.23 => 2.24}/envs/global.env (100%) rename apps/macos/{2.23 => 2.24}/scripts/init.sh (100%) rename apps/macos/{2.23 => 2.24}/scripts/uninstall.sh (100%) rename apps/macos/{2.23 => 2.24}/scripts/upgrade.sh (100%) diff --git a/apps/macos/2.23/data.yml b/apps/macos/2.24/data.yml similarity index 100% rename from apps/macos/2.23/data.yml rename to apps/macos/2.24/data.yml diff --git a/apps/macos/2.23/docker-compose.yml b/apps/macos/2.24/docker-compose.yml similarity index 100% rename from apps/macos/2.23/docker-compose.yml rename to apps/macos/2.24/docker-compose.yml diff --git a/apps/macos/2.23/envs/default.env b/apps/macos/2.24/envs/default.env similarity index 100% rename from apps/macos/2.23/envs/default.env rename to apps/macos/2.24/envs/default.env diff --git a/apps/macos/2.23/envs/global.env b/apps/macos/2.24/envs/global.env similarity index 100% rename from apps/macos/2.23/envs/global.env rename to apps/macos/2.24/envs/global.env diff --git a/apps/macos/2.23/scripts/init.sh b/apps/macos/2.24/scripts/init.sh similarity index 100% rename from apps/macos/2.23/scripts/init.sh rename to apps/macos/2.24/scripts/init.sh diff --git a/apps/macos/2.23/scripts/uninstall.sh b/apps/macos/2.24/scripts/uninstall.sh similarity index 100% rename from apps/macos/2.23/scripts/uninstall.sh rename to apps/macos/2.24/scripts/uninstall.sh diff --git a/apps/macos/2.23/scripts/upgrade.sh b/apps/macos/2.24/scripts/upgrade.sh similarity index 100% rename from apps/macos/2.23/scripts/upgrade.sh rename to apps/macos/2.24/scripts/upgrade.sh From c26451cc20529e093e118b91f72e798a177c0e1b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 22:27:45 +0000 Subject: [PATCH 178/262] Update ghcr.io/immich-app/immich-server Docker tag to v2.1.0 --- apps/immich-no-machine/2.0.1/docker-compose.yml | 2 +- apps/immich-server/2.0.1/docker-compose.yml | 2 +- apps/immich/2.0.1/docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/immich-no-machine/2.0.1/docker-compose.yml b/apps/immich-no-machine/2.0.1/docker-compose.yml index c58c12311..0b297337a 100644 --- a/apps/immich-no-machine/2.0.1/docker-compose.yml +++ b/apps/immich-no-machine/2.0.1/docker-compose.yml @@ -26,7 +26,7 @@ services: immich-server: depends_on: - immich-pg14-vectors - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich-server/2.0.1/docker-compose.yml b/apps/immich-server/2.0.1/docker-compose.yml index bafb12f7c..d3908333e 100644 --- a/apps/immich-server/2.0.1/docker-compose.yml +++ b/apps/immich-server/2.0.1/docker-compose.yml @@ -6,7 +6,7 @@ name: immich-server services: immich-server: - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich/2.0.1/docker-compose.yml b/apps/immich/2.0.1/docker-compose.yml index 9b4109c86..f28e00a71 100644 --- a/apps/immich/2.0.1/docker-compose.yml +++ b/apps/immich/2.0.1/docker-compose.yml @@ -26,7 +26,7 @@ services: immich-server: depends_on: - immich-pg14-vectors - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 3893032f98005c03f191a7d7f18a718b6d825314 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 22:27:57 +0000 Subject: [PATCH 179/262] Update app version [skip ci] --- apps/immich-no-machine/{2.0.1 => 2.1.0}/data.yml | 0 apps/immich-no-machine/{2.0.1 => 2.1.0}/docker-compose.yml | 0 apps/immich-no-machine/{2.0.1 => 2.1.0}/envs/default.env | 0 apps/immich-no-machine/{2.0.1 => 2.1.0}/envs/global.env | 0 apps/immich-no-machine/{2.0.1 => 2.1.0}/scripts/init.sh | 0 apps/immich-no-machine/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 apps/immich-no-machine/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/data.yml (100%) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/docker-compose.yml (100%) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/envs/default.env (100%) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/envs/global.env (100%) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename apps/immich-no-machine/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) diff --git a/apps/immich-no-machine/2.0.1/data.yml b/apps/immich-no-machine/2.1.0/data.yml similarity index 100% rename from apps/immich-no-machine/2.0.1/data.yml rename to apps/immich-no-machine/2.1.0/data.yml diff --git a/apps/immich-no-machine/2.0.1/docker-compose.yml b/apps/immich-no-machine/2.1.0/docker-compose.yml similarity index 100% rename from apps/immich-no-machine/2.0.1/docker-compose.yml rename to apps/immich-no-machine/2.1.0/docker-compose.yml diff --git a/apps/immich-no-machine/2.0.1/envs/default.env b/apps/immich-no-machine/2.1.0/envs/default.env similarity index 100% rename from apps/immich-no-machine/2.0.1/envs/default.env rename to apps/immich-no-machine/2.1.0/envs/default.env diff --git a/apps/immich-no-machine/2.0.1/envs/global.env b/apps/immich-no-machine/2.1.0/envs/global.env similarity index 100% rename from apps/immich-no-machine/2.0.1/envs/global.env rename to apps/immich-no-machine/2.1.0/envs/global.env diff --git a/apps/immich-no-machine/2.0.1/scripts/init.sh b/apps/immich-no-machine/2.1.0/scripts/init.sh similarity index 100% rename from apps/immich-no-machine/2.0.1/scripts/init.sh rename to apps/immich-no-machine/2.1.0/scripts/init.sh diff --git a/apps/immich-no-machine/2.0.1/scripts/uninstall.sh b/apps/immich-no-machine/2.1.0/scripts/uninstall.sh similarity index 100% rename from apps/immich-no-machine/2.0.1/scripts/uninstall.sh rename to apps/immich-no-machine/2.1.0/scripts/uninstall.sh diff --git a/apps/immich-no-machine/2.0.1/scripts/upgrade.sh b/apps/immich-no-machine/2.1.0/scripts/upgrade.sh similarity index 100% rename from apps/immich-no-machine/2.0.1/scripts/upgrade.sh rename to apps/immich-no-machine/2.1.0/scripts/upgrade.sh From 9524177cb91ce2c83f831a39d4ebc57d169ea18d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 22:27:57 +0000 Subject: [PATCH 180/262] Update app version [skip ci] --- apps/immich-server/{2.0.1 => 2.1.0}/data.yml | 0 apps/immich-server/{2.0.1 => 2.1.0}/docker-compose.yml | 0 apps/immich-server/{2.0.1 => 2.1.0}/envs/default.env | 0 apps/immich-server/{2.0.1 => 2.1.0}/envs/global.env | 0 apps/immich-server/{2.0.1 => 2.1.0}/scripts/init.sh | 0 apps/immich-server/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 apps/immich-server/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich-server/{2.0.1 => 2.1.0}/data.yml (100%) rename apps/immich-server/{2.0.1 => 2.1.0}/docker-compose.yml (100%) rename apps/immich-server/{2.0.1 => 2.1.0}/envs/default.env (100%) rename apps/immich-server/{2.0.1 => 2.1.0}/envs/global.env (100%) rename apps/immich-server/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename apps/immich-server/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename apps/immich-server/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) diff --git a/apps/immich-server/2.0.1/data.yml b/apps/immich-server/2.1.0/data.yml similarity index 100% rename from apps/immich-server/2.0.1/data.yml rename to apps/immich-server/2.1.0/data.yml diff --git a/apps/immich-server/2.0.1/docker-compose.yml b/apps/immich-server/2.1.0/docker-compose.yml similarity index 100% rename from apps/immich-server/2.0.1/docker-compose.yml rename to apps/immich-server/2.1.0/docker-compose.yml diff --git a/apps/immich-server/2.0.1/envs/default.env b/apps/immich-server/2.1.0/envs/default.env similarity index 100% rename from apps/immich-server/2.0.1/envs/default.env rename to apps/immich-server/2.1.0/envs/default.env diff --git a/apps/immich-server/2.0.1/envs/global.env b/apps/immich-server/2.1.0/envs/global.env similarity index 100% rename from apps/immich-server/2.0.1/envs/global.env rename to apps/immich-server/2.1.0/envs/global.env diff --git a/apps/immich-server/2.0.1/scripts/init.sh b/apps/immich-server/2.1.0/scripts/init.sh similarity index 100% rename from apps/immich-server/2.0.1/scripts/init.sh rename to apps/immich-server/2.1.0/scripts/init.sh diff --git a/apps/immich-server/2.0.1/scripts/uninstall.sh b/apps/immich-server/2.1.0/scripts/uninstall.sh similarity index 100% rename from apps/immich-server/2.0.1/scripts/uninstall.sh rename to apps/immich-server/2.1.0/scripts/uninstall.sh diff --git a/apps/immich-server/2.0.1/scripts/upgrade.sh b/apps/immich-server/2.1.0/scripts/upgrade.sh similarity index 100% rename from apps/immich-server/2.0.1/scripts/upgrade.sh rename to apps/immich-server/2.1.0/scripts/upgrade.sh From 64a33dabe675da37f34ae17aef6b47f65790386a Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 15 Oct 2025 22:27:58 +0000 Subject: [PATCH 181/262] Update app version [skip ci] --- apps/immich/{2.0.1 => 2.1.0}/data.yml | 0 apps/immich/{2.0.1 => 2.1.0}/docker-compose.yml | 0 apps/immich/{2.0.1 => 2.1.0}/envs/default.env | 0 apps/immich/{2.0.1 => 2.1.0}/envs/global.env | 0 apps/immich/{2.0.1 => 2.1.0}/scripts/init.sh | 0 apps/immich/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 apps/immich/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich/{2.0.1 => 2.1.0}/data.yml (100%) rename apps/immich/{2.0.1 => 2.1.0}/docker-compose.yml (100%) rename apps/immich/{2.0.1 => 2.1.0}/envs/default.env (100%) rename apps/immich/{2.0.1 => 2.1.0}/envs/global.env (100%) rename apps/immich/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename apps/immich/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename apps/immich/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) diff --git a/apps/immich/2.0.1/data.yml b/apps/immich/2.1.0/data.yml similarity index 100% rename from apps/immich/2.0.1/data.yml rename to apps/immich/2.1.0/data.yml diff --git a/apps/immich/2.0.1/docker-compose.yml b/apps/immich/2.1.0/docker-compose.yml similarity index 100% rename from apps/immich/2.0.1/docker-compose.yml rename to apps/immich/2.1.0/docker-compose.yml diff --git a/apps/immich/2.0.1/envs/default.env b/apps/immich/2.1.0/envs/default.env similarity index 100% rename from apps/immich/2.0.1/envs/default.env rename to apps/immich/2.1.0/envs/default.env diff --git a/apps/immich/2.0.1/envs/global.env b/apps/immich/2.1.0/envs/global.env similarity index 100% rename from apps/immich/2.0.1/envs/global.env rename to apps/immich/2.1.0/envs/global.env diff --git a/apps/immich/2.0.1/scripts/init.sh b/apps/immich/2.1.0/scripts/init.sh similarity index 100% rename from apps/immich/2.0.1/scripts/init.sh rename to apps/immich/2.1.0/scripts/init.sh diff --git a/apps/immich/2.0.1/scripts/uninstall.sh b/apps/immich/2.1.0/scripts/uninstall.sh similarity index 100% rename from apps/immich/2.0.1/scripts/uninstall.sh rename to apps/immich/2.1.0/scripts/uninstall.sh diff --git a/apps/immich/2.0.1/scripts/upgrade.sh b/apps/immich/2.1.0/scripts/upgrade.sh similarity index 100% rename from apps/immich/2.0.1/scripts/upgrade.sh rename to apps/immich/2.1.0/scripts/upgrade.sh From abc77ea1efe44052831a184bf19d903b328ebc2d Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 16 Oct 2025 01:41:50 +0000 Subject: [PATCH 182/262] Processed apps directory via GitHub Actions --- appstore/immich-no-machine/{2.0.1 => 2.1.0}/.env | 0 appstore/immich-no-machine/{2.0.1 => 2.1.0}/data.yml | 0 appstore/immich-no-machine/{2.0.1 => 2.1.0}/docker-compose.yml | 2 +- appstore/immich-no-machine/{2.0.1 => 2.1.0}/envs/default.env | 0 appstore/immich-no-machine/{2.0.1 => 2.1.0}/envs/global.env | 0 appstore/immich-no-machine/{2.0.1 => 2.1.0}/scripts/init.sh | 0 .../immich-no-machine/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 appstore/immich-no-machine/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 appstore/immich-server/{2.0.1 => 2.1.0}/.env | 0 appstore/immich-server/{2.0.1 => 2.1.0}/data.yml | 0 appstore/immich-server/{2.0.1 => 2.1.0}/docker-compose.yml | 2 +- appstore/immich-server/{2.0.1 => 2.1.0}/envs/default.env | 0 appstore/immich-server/{2.0.1 => 2.1.0}/envs/global.env | 0 appstore/immich-server/{2.0.1 => 2.1.0}/scripts/init.sh | 0 appstore/immich-server/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 appstore/immich-server/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 appstore/immich/{2.0.1 => 2.1.0}/.env | 0 appstore/immich/{2.0.1 => 2.1.0}/data.yml | 0 appstore/immich/{2.0.1 => 2.1.0}/docker-compose.yml | 2 +- appstore/immich/{2.0.1 => 2.1.0}/envs/default.env | 0 appstore/immich/{2.0.1 => 2.1.0}/envs/global.env | 0 appstore/immich/{2.0.1 => 2.1.0}/scripts/init.sh | 0 appstore/immich/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 appstore/immich/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 appstore/macos/{2.23 => 2.24}/.env | 0 appstore/macos/{2.23 => 2.24}/data.yml | 0 appstore/macos/{2.23 => 2.24}/docker-compose.yml | 2 +- appstore/macos/{2.23 => 2.24}/envs/default.env | 0 appstore/macos/{2.23 => 2.24}/envs/global.env | 0 appstore/macos/{2.23 => 2.24}/scripts/init.sh | 0 appstore/macos/{2.23 => 2.24}/scripts/uninstall.sh | 0 appstore/macos/{2.23 => 2.24}/scripts/upgrade.sh | 0 dockge/immich-no-machine/docker-compose.yml | 2 +- dockge/immich-server/docker-compose.yml | 2 +- dockge/immich/docker-compose.yml | 2 +- dockge/macos/docker-compose.yml | 2 +- 36 files changed, 8 insertions(+), 8 deletions(-) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/.env (100%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/data.yml (100%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/docker-compose.yml (95%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/envs/default.env (100%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/envs/global.env (100%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename appstore/immich-no-machine/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/.env (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/data.yml (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/docker-compose.yml (89%) rename appstore/immich-server/{2.0.1 => 2.1.0}/envs/default.env (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/envs/global.env (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename appstore/immich-server/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) rename appstore/immich/{2.0.1 => 2.1.0}/.env (100%) rename appstore/immich/{2.0.1 => 2.1.0}/data.yml (100%) rename appstore/immich/{2.0.1 => 2.1.0}/docker-compose.yml (96%) rename appstore/immich/{2.0.1 => 2.1.0}/envs/default.env (100%) rename appstore/immich/{2.0.1 => 2.1.0}/envs/global.env (100%) rename appstore/immich/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename appstore/immich/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename appstore/immich/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) rename appstore/macos/{2.23 => 2.24}/.env (100%) rename appstore/macos/{2.23 => 2.24}/data.yml (100%) rename appstore/macos/{2.23 => 2.24}/docker-compose.yml (95%) rename appstore/macos/{2.23 => 2.24}/envs/default.env (100%) rename appstore/macos/{2.23 => 2.24}/envs/global.env (100%) rename appstore/macos/{2.23 => 2.24}/scripts/init.sh (100%) rename appstore/macos/{2.23 => 2.24}/scripts/uninstall.sh (100%) rename appstore/macos/{2.23 => 2.24}/scripts/upgrade.sh (100%) diff --git a/appstore/immich-no-machine/2.0.1/.env b/appstore/immich-no-machine/2.1.0/.env similarity index 100% rename from appstore/immich-no-machine/2.0.1/.env rename to appstore/immich-no-machine/2.1.0/.env diff --git a/appstore/immich-no-machine/2.0.1/data.yml b/appstore/immich-no-machine/2.1.0/data.yml similarity index 100% rename from appstore/immich-no-machine/2.0.1/data.yml rename to appstore/immich-no-machine/2.1.0/data.yml diff --git a/appstore/immich-no-machine/2.0.1/docker-compose.yml b/appstore/immich-no-machine/2.1.0/docker-compose.yml similarity index 95% rename from appstore/immich-no-machine/2.0.1/docker-compose.yml rename to appstore/immich-no-machine/2.1.0/docker-compose.yml index f845557b2..bcfe12551 100644 --- a/appstore/immich-no-machine/2.0.1/docker-compose.yml +++ b/appstore/immich-no-machine/2.1.0/docker-compose.yml @@ -29,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 labels: createdBy: Apps networks: diff --git a/appstore/immich-no-machine/2.0.1/envs/default.env b/appstore/immich-no-machine/2.1.0/envs/default.env similarity index 100% rename from appstore/immich-no-machine/2.0.1/envs/default.env rename to appstore/immich-no-machine/2.1.0/envs/default.env diff --git a/appstore/immich-no-machine/2.0.1/envs/global.env b/appstore/immich-no-machine/2.1.0/envs/global.env similarity index 100% rename from appstore/immich-no-machine/2.0.1/envs/global.env rename to appstore/immich-no-machine/2.1.0/envs/global.env diff --git a/appstore/immich-no-machine/2.0.1/scripts/init.sh b/appstore/immich-no-machine/2.1.0/scripts/init.sh similarity index 100% rename from appstore/immich-no-machine/2.0.1/scripts/init.sh rename to appstore/immich-no-machine/2.1.0/scripts/init.sh diff --git a/appstore/immich-no-machine/2.0.1/scripts/uninstall.sh b/appstore/immich-no-machine/2.1.0/scripts/uninstall.sh similarity index 100% rename from appstore/immich-no-machine/2.0.1/scripts/uninstall.sh rename to appstore/immich-no-machine/2.1.0/scripts/uninstall.sh diff --git a/appstore/immich-no-machine/2.0.1/scripts/upgrade.sh b/appstore/immich-no-machine/2.1.0/scripts/upgrade.sh similarity index 100% rename from appstore/immich-no-machine/2.0.1/scripts/upgrade.sh rename to appstore/immich-no-machine/2.1.0/scripts/upgrade.sh diff --git a/appstore/immich-server/2.0.1/.env b/appstore/immich-server/2.1.0/.env similarity index 100% rename from appstore/immich-server/2.0.1/.env rename to appstore/immich-server/2.1.0/.env diff --git a/appstore/immich-server/2.0.1/data.yml b/appstore/immich-server/2.1.0/data.yml similarity index 100% rename from appstore/immich-server/2.0.1/data.yml rename to appstore/immich-server/2.1.0/data.yml diff --git a/appstore/immich-server/2.0.1/docker-compose.yml b/appstore/immich-server/2.1.0/docker-compose.yml similarity index 89% rename from appstore/immich-server/2.0.1/docker-compose.yml rename to appstore/immich-server/2.1.0/docker-compose.yml index 7d4d5a6f2..1daf03e25 100644 --- a/appstore/immich-server/2.0.1/docker-compose.yml +++ b/appstore/immich-server/2.1.0/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 labels: createdBy: Apps networks: diff --git a/appstore/immich-server/2.0.1/envs/default.env b/appstore/immich-server/2.1.0/envs/default.env similarity index 100% rename from appstore/immich-server/2.0.1/envs/default.env rename to appstore/immich-server/2.1.0/envs/default.env diff --git a/appstore/immich-server/2.0.1/envs/global.env b/appstore/immich-server/2.1.0/envs/global.env similarity index 100% rename from appstore/immich-server/2.0.1/envs/global.env rename to appstore/immich-server/2.1.0/envs/global.env diff --git a/appstore/immich-server/2.0.1/scripts/init.sh b/appstore/immich-server/2.1.0/scripts/init.sh similarity index 100% rename from appstore/immich-server/2.0.1/scripts/init.sh rename to appstore/immich-server/2.1.0/scripts/init.sh diff --git a/appstore/immich-server/2.0.1/scripts/uninstall.sh b/appstore/immich-server/2.1.0/scripts/uninstall.sh similarity index 100% rename from appstore/immich-server/2.0.1/scripts/uninstall.sh rename to appstore/immich-server/2.1.0/scripts/uninstall.sh diff --git a/appstore/immich-server/2.0.1/scripts/upgrade.sh b/appstore/immich-server/2.1.0/scripts/upgrade.sh similarity index 100% rename from appstore/immich-server/2.0.1/scripts/upgrade.sh rename to appstore/immich-server/2.1.0/scripts/upgrade.sh diff --git a/appstore/immich/2.0.1/.env b/appstore/immich/2.1.0/.env similarity index 100% rename from appstore/immich/2.0.1/.env rename to appstore/immich/2.1.0/.env diff --git a/appstore/immich/2.0.1/data.yml b/appstore/immich/2.1.0/data.yml similarity index 100% rename from appstore/immich/2.0.1/data.yml rename to appstore/immich/2.1.0/data.yml diff --git a/appstore/immich/2.0.1/docker-compose.yml b/appstore/immich/2.1.0/docker-compose.yml similarity index 96% rename from appstore/immich/2.0.1/docker-compose.yml rename to appstore/immich/2.1.0/docker-compose.yml index 7949e94d4..803c81183 100644 --- a/appstore/immich/2.0.1/docker-compose.yml +++ b/appstore/immich/2.1.0/docker-compose.yml @@ -45,7 +45,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 labels: createdBy: Apps networks: diff --git a/appstore/immich/2.0.1/envs/default.env b/appstore/immich/2.1.0/envs/default.env similarity index 100% rename from appstore/immich/2.0.1/envs/default.env rename to appstore/immich/2.1.0/envs/default.env diff --git a/appstore/immich/2.0.1/envs/global.env b/appstore/immich/2.1.0/envs/global.env similarity index 100% rename from appstore/immich/2.0.1/envs/global.env rename to appstore/immich/2.1.0/envs/global.env diff --git a/appstore/immich/2.0.1/scripts/init.sh b/appstore/immich/2.1.0/scripts/init.sh similarity index 100% rename from appstore/immich/2.0.1/scripts/init.sh rename to appstore/immich/2.1.0/scripts/init.sh diff --git a/appstore/immich/2.0.1/scripts/uninstall.sh b/appstore/immich/2.1.0/scripts/uninstall.sh similarity index 100% rename from appstore/immich/2.0.1/scripts/uninstall.sh rename to appstore/immich/2.1.0/scripts/uninstall.sh diff --git a/appstore/immich/2.0.1/scripts/upgrade.sh b/appstore/immich/2.1.0/scripts/upgrade.sh similarity index 100% rename from appstore/immich/2.0.1/scripts/upgrade.sh rename to appstore/immich/2.1.0/scripts/upgrade.sh diff --git a/appstore/macos/2.23/.env b/appstore/macos/2.24/.env similarity index 100% rename from appstore/macos/2.23/.env rename to appstore/macos/2.24/.env diff --git a/appstore/macos/2.23/data.yml b/appstore/macos/2.24/data.yml similarity index 100% rename from appstore/macos/2.23/data.yml rename to appstore/macos/2.24/data.yml diff --git a/appstore/macos/2.23/docker-compose.yml b/appstore/macos/2.24/docker-compose.yml similarity index 95% rename from appstore/macos/2.23/docker-compose.yml rename to appstore/macos/2.24/docker-compose.yml index 254e7a38c..e2ec21ecc 100644 --- a/appstore/macos/2.23/docker-compose.yml +++ b/appstore/macos/2.24/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - VERSION=${VERSION} - image: dockurr/macos:2.23 + image: dockurr/macos:2.24 labels: createdBy: Apps networks: diff --git a/appstore/macos/2.23/envs/default.env b/appstore/macos/2.24/envs/default.env similarity index 100% rename from appstore/macos/2.23/envs/default.env rename to appstore/macos/2.24/envs/default.env diff --git a/appstore/macos/2.23/envs/global.env b/appstore/macos/2.24/envs/global.env similarity index 100% rename from appstore/macos/2.23/envs/global.env rename to appstore/macos/2.24/envs/global.env diff --git a/appstore/macos/2.23/scripts/init.sh b/appstore/macos/2.24/scripts/init.sh similarity index 100% rename from appstore/macos/2.23/scripts/init.sh rename to appstore/macos/2.24/scripts/init.sh diff --git a/appstore/macos/2.23/scripts/uninstall.sh b/appstore/macos/2.24/scripts/uninstall.sh similarity index 100% rename from appstore/macos/2.23/scripts/uninstall.sh rename to appstore/macos/2.24/scripts/uninstall.sh diff --git a/appstore/macos/2.23/scripts/upgrade.sh b/appstore/macos/2.24/scripts/upgrade.sh similarity index 100% rename from appstore/macos/2.23/scripts/upgrade.sh rename to appstore/macos/2.24/scripts/upgrade.sh diff --git a/dockge/immich-no-machine/docker-compose.yml b/dockge/immich-no-machine/docker-compose.yml index f845557b2..bcfe12551 100644 --- a/dockge/immich-no-machine/docker-compose.yml +++ b/dockge/immich-no-machine/docker-compose.yml @@ -29,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 labels: createdBy: Apps networks: diff --git a/dockge/immich-server/docker-compose.yml b/dockge/immich-server/docker-compose.yml index 7d4d5a6f2..1daf03e25 100644 --- a/dockge/immich-server/docker-compose.yml +++ b/dockge/immich-server/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 labels: createdBy: Apps networks: diff --git a/dockge/immich/docker-compose.yml b/dockge/immich/docker-compose.yml index 7949e94d4..803c81183 100644 --- a/dockge/immich/docker-compose.yml +++ b/dockge/immich/docker-compose.yml @@ -45,7 +45,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.0.1 + image: ghcr.io/immich-app/immich-server:v2.1.0 labels: createdBy: Apps networks: diff --git a/dockge/macos/docker-compose.yml b/dockge/macos/docker-compose.yml index 254e7a38c..e2ec21ecc 100644 --- a/dockge/macos/docker-compose.yml +++ b/dockge/macos/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - VERSION=${VERSION} - image: dockurr/macos:2.23 + image: dockurr/macos:2.24 labels: createdBy: Apps networks: From fe7e5a08841e8abe6b75d7296b5b1d687a898b97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 01:44:23 +0000 Subject: [PATCH 183/262] Update cloudreve/cloudreve Docker tag to v4.9.2 --- apps/cloudreve/4.9.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cloudreve/4.9.1/docker-compose.yml b/apps/cloudreve/4.9.1/docker-compose.yml index ea1d01ec4..d6c7aaa2e 100644 --- a/apps/cloudreve/4.9.1/docker-compose.yml +++ b/apps/cloudreve/4.9.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: cloudreve: - image: cloudreve/cloudreve:4.9.1 + image: cloudreve/cloudreve:4.9.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 59c9ac90a1ef706d1de28ed67ec47d71afb94f61 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 16 Oct 2025 01:44:33 +0000 Subject: [PATCH 184/262] Update app version [skip ci] --- apps/cloudreve/{4.9.1 => 4.9.2}/data.yml | 0 apps/cloudreve/{4.9.1 => 4.9.2}/docker-compose.yml | 0 apps/cloudreve/{4.9.1 => 4.9.2}/envs/default.env | 0 apps/cloudreve/{4.9.1 => 4.9.2}/envs/global.env | 0 apps/cloudreve/{4.9.1 => 4.9.2}/scripts/init.sh | 0 apps/cloudreve/{4.9.1 => 4.9.2}/scripts/uninstall.sh | 0 apps/cloudreve/{4.9.1 => 4.9.2}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/cloudreve/{4.9.1 => 4.9.2}/data.yml (100%) rename apps/cloudreve/{4.9.1 => 4.9.2}/docker-compose.yml (100%) rename apps/cloudreve/{4.9.1 => 4.9.2}/envs/default.env (100%) rename apps/cloudreve/{4.9.1 => 4.9.2}/envs/global.env (100%) rename apps/cloudreve/{4.9.1 => 4.9.2}/scripts/init.sh (100%) rename apps/cloudreve/{4.9.1 => 4.9.2}/scripts/uninstall.sh (100%) rename apps/cloudreve/{4.9.1 => 4.9.2}/scripts/upgrade.sh (100%) diff --git a/apps/cloudreve/4.9.1/data.yml b/apps/cloudreve/4.9.2/data.yml similarity index 100% rename from apps/cloudreve/4.9.1/data.yml rename to apps/cloudreve/4.9.2/data.yml diff --git a/apps/cloudreve/4.9.1/docker-compose.yml b/apps/cloudreve/4.9.2/docker-compose.yml similarity index 100% rename from apps/cloudreve/4.9.1/docker-compose.yml rename to apps/cloudreve/4.9.2/docker-compose.yml diff --git a/apps/cloudreve/4.9.1/envs/default.env b/apps/cloudreve/4.9.2/envs/default.env similarity index 100% rename from apps/cloudreve/4.9.1/envs/default.env rename to apps/cloudreve/4.9.2/envs/default.env diff --git a/apps/cloudreve/4.9.1/envs/global.env b/apps/cloudreve/4.9.2/envs/global.env similarity index 100% rename from apps/cloudreve/4.9.1/envs/global.env rename to apps/cloudreve/4.9.2/envs/global.env diff --git a/apps/cloudreve/4.9.1/scripts/init.sh b/apps/cloudreve/4.9.2/scripts/init.sh similarity index 100% rename from apps/cloudreve/4.9.1/scripts/init.sh rename to apps/cloudreve/4.9.2/scripts/init.sh diff --git a/apps/cloudreve/4.9.1/scripts/uninstall.sh b/apps/cloudreve/4.9.2/scripts/uninstall.sh similarity index 100% rename from apps/cloudreve/4.9.1/scripts/uninstall.sh rename to apps/cloudreve/4.9.2/scripts/uninstall.sh diff --git a/apps/cloudreve/4.9.1/scripts/upgrade.sh b/apps/cloudreve/4.9.2/scripts/upgrade.sh similarity index 100% rename from apps/cloudreve/4.9.1/scripts/upgrade.sh rename to apps/cloudreve/4.9.2/scripts/upgrade.sh From 41aac5ab4c20f63c6a6358701eaf03ebd01ce27a Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 16 Oct 2025 03:37:05 +0000 Subject: [PATCH 185/262] Processed apps directory via GitHub Actions --- appstore/cloudreve/{4.9.1 => 4.9.2}/.env | 0 appstore/cloudreve/{4.9.1 => 4.9.2}/data.yml | 0 appstore/cloudreve/{4.9.1 => 4.9.2}/docker-compose.yml | 2 +- appstore/cloudreve/{4.9.1 => 4.9.2}/envs/default.env | 0 appstore/cloudreve/{4.9.1 => 4.9.2}/envs/global.env | 0 appstore/cloudreve/{4.9.1 => 4.9.2}/scripts/init.sh | 0 appstore/cloudreve/{4.9.1 => 4.9.2}/scripts/uninstall.sh | 0 appstore/cloudreve/{4.9.1 => 4.9.2}/scripts/upgrade.sh | 0 dockge/cloudreve/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/cloudreve/{4.9.1 => 4.9.2}/.env (100%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/data.yml (100%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/docker-compose.yml (91%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/envs/default.env (100%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/envs/global.env (100%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/scripts/init.sh (100%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/scripts/uninstall.sh (100%) rename appstore/cloudreve/{4.9.1 => 4.9.2}/scripts/upgrade.sh (100%) diff --git a/appstore/cloudreve/4.9.1/.env b/appstore/cloudreve/4.9.2/.env similarity index 100% rename from appstore/cloudreve/4.9.1/.env rename to appstore/cloudreve/4.9.2/.env diff --git a/appstore/cloudreve/4.9.1/data.yml b/appstore/cloudreve/4.9.2/data.yml similarity index 100% rename from appstore/cloudreve/4.9.1/data.yml rename to appstore/cloudreve/4.9.2/data.yml diff --git a/appstore/cloudreve/4.9.1/docker-compose.yml b/appstore/cloudreve/4.9.2/docker-compose.yml similarity index 91% rename from appstore/cloudreve/4.9.1/docker-compose.yml rename to appstore/cloudreve/4.9.2/docker-compose.yml index b720518da..f5ce23ad0 100644 --- a/appstore/cloudreve/4.9.1/docker-compose.yml +++ b/appstore/cloudreve/4.9.2/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.9.1 + image: cloudreve/cloudreve:4.9.2 labels: createdBy: Apps networks: diff --git a/appstore/cloudreve/4.9.1/envs/default.env b/appstore/cloudreve/4.9.2/envs/default.env similarity index 100% rename from appstore/cloudreve/4.9.1/envs/default.env rename to appstore/cloudreve/4.9.2/envs/default.env diff --git a/appstore/cloudreve/4.9.1/envs/global.env b/appstore/cloudreve/4.9.2/envs/global.env similarity index 100% rename from appstore/cloudreve/4.9.1/envs/global.env rename to appstore/cloudreve/4.9.2/envs/global.env diff --git a/appstore/cloudreve/4.9.1/scripts/init.sh b/appstore/cloudreve/4.9.2/scripts/init.sh similarity index 100% rename from appstore/cloudreve/4.9.1/scripts/init.sh rename to appstore/cloudreve/4.9.2/scripts/init.sh diff --git a/appstore/cloudreve/4.9.1/scripts/uninstall.sh b/appstore/cloudreve/4.9.2/scripts/uninstall.sh similarity index 100% rename from appstore/cloudreve/4.9.1/scripts/uninstall.sh rename to appstore/cloudreve/4.9.2/scripts/uninstall.sh diff --git a/appstore/cloudreve/4.9.1/scripts/upgrade.sh b/appstore/cloudreve/4.9.2/scripts/upgrade.sh similarity index 100% rename from appstore/cloudreve/4.9.1/scripts/upgrade.sh rename to appstore/cloudreve/4.9.2/scripts/upgrade.sh diff --git a/dockge/cloudreve/docker-compose.yml b/dockge/cloudreve/docker-compose.yml index b720518da..f5ce23ad0 100644 --- a/dockge/cloudreve/docker-compose.yml +++ b/dockge/cloudreve/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.9.1 + image: cloudreve/cloudreve:4.9.2 labels: createdBy: Apps networks: From 1404a0cce5349adc9ddb077934b1c1fee8d5c7c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 10:16:59 +0000 Subject: [PATCH 186/262] Update ghcr.io/immich-app/immich-machine-learning Docker tag to v2.1.0 --- apps/immich-machine-learning/2.0.1/docker-compose.yml | 2 +- apps/immich/2.1.0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/immich-machine-learning/2.0.1/docker-compose.yml b/apps/immich-machine-learning/2.0.1/docker-compose.yml index 3319c128e..b72e599eb 100644 --- a/apps/immich-machine-learning/2.0.1/docker-compose.yml +++ b/apps/immich-machine-learning/2.0.1/docker-compose.yml @@ -6,7 +6,7 @@ name: immich-machine-learning services: immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 + image: ghcr.io/immich-app/immich-machine-learning:v2.1.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich/2.1.0/docker-compose.yml b/apps/immich/2.1.0/docker-compose.yml index f28e00a71..d1372e99f 100644 --- a/apps/immich/2.1.0/docker-compose.yml +++ b/apps/immich/2.1.0/docker-compose.yml @@ -52,7 +52,7 @@ services: - /etc/localtime:/etc/localtime immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 + image: ghcr.io/immich-app/immich-machine-learning:v2.1.0 container_name: machine-learning-${CONTAINER_NAME} labels: createdBy: "Apps" From b07796a4f3ff636a2ca4a655dc1c7c9008d11c0a Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 16 Oct 2025 10:17:11 +0000 Subject: [PATCH 187/262] Update app version [skip ci] --- apps/immich-machine-learning/{2.0.1 => 2.1.0}/data.yml | 0 apps/immich-machine-learning/{2.0.1 => 2.1.0}/docker-compose.yml | 0 apps/immich-machine-learning/{2.0.1 => 2.1.0}/envs/default.env | 0 apps/immich-machine-learning/{2.0.1 => 2.1.0}/envs/global.env | 0 apps/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/init.sh | 0 .../immich-machine-learning/{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 apps/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/data.yml (100%) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/docker-compose.yml (100%) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/envs/default.env (100%) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/envs/global.env (100%) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename apps/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) diff --git a/apps/immich-machine-learning/2.0.1/data.yml b/apps/immich-machine-learning/2.1.0/data.yml similarity index 100% rename from apps/immich-machine-learning/2.0.1/data.yml rename to apps/immich-machine-learning/2.1.0/data.yml diff --git a/apps/immich-machine-learning/2.0.1/docker-compose.yml b/apps/immich-machine-learning/2.1.0/docker-compose.yml similarity index 100% rename from apps/immich-machine-learning/2.0.1/docker-compose.yml rename to apps/immich-machine-learning/2.1.0/docker-compose.yml diff --git a/apps/immich-machine-learning/2.0.1/envs/default.env b/apps/immich-machine-learning/2.1.0/envs/default.env similarity index 100% rename from apps/immich-machine-learning/2.0.1/envs/default.env rename to apps/immich-machine-learning/2.1.0/envs/default.env diff --git a/apps/immich-machine-learning/2.0.1/envs/global.env b/apps/immich-machine-learning/2.1.0/envs/global.env similarity index 100% rename from apps/immich-machine-learning/2.0.1/envs/global.env rename to apps/immich-machine-learning/2.1.0/envs/global.env diff --git a/apps/immich-machine-learning/2.0.1/scripts/init.sh b/apps/immich-machine-learning/2.1.0/scripts/init.sh similarity index 100% rename from apps/immich-machine-learning/2.0.1/scripts/init.sh rename to apps/immich-machine-learning/2.1.0/scripts/init.sh diff --git a/apps/immich-machine-learning/2.0.1/scripts/uninstall.sh b/apps/immich-machine-learning/2.1.0/scripts/uninstall.sh similarity index 100% rename from apps/immich-machine-learning/2.0.1/scripts/uninstall.sh rename to apps/immich-machine-learning/2.1.0/scripts/uninstall.sh diff --git a/apps/immich-machine-learning/2.0.1/scripts/upgrade.sh b/apps/immich-machine-learning/2.1.0/scripts/upgrade.sh similarity index 100% rename from apps/immich-machine-learning/2.0.1/scripts/upgrade.sh rename to apps/immich-machine-learning/2.1.0/scripts/upgrade.sh From beb1fe95de7d8ae8d51274c96770ae78a495344a Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 16 Oct 2025 12:47:07 +0000 Subject: [PATCH 188/262] Processed apps directory via GitHub Actions --- appstore/immich-machine-learning/{2.0.1 => 2.1.0}/.env | 0 appstore/immich-machine-learning/{2.0.1 => 2.1.0}/data.yml | 0 .../immich-machine-learning/{2.0.1 => 2.1.0}/docker-compose.yml | 2 +- .../immich-machine-learning/{2.0.1 => 2.1.0}/envs/default.env | 0 .../immich-machine-learning/{2.0.1 => 2.1.0}/envs/global.env | 0 .../immich-machine-learning/{2.0.1 => 2.1.0}/scripts/init.sh | 0 .../{2.0.1 => 2.1.0}/scripts/uninstall.sh | 0 .../immich-machine-learning/{2.0.1 => 2.1.0}/scripts/upgrade.sh | 0 appstore/immich/2.1.0/docker-compose.yml | 2 +- dockge/immich-machine-learning/docker-compose.yml | 2 +- dockge/immich/docker-compose.yml | 2 +- 11 files changed, 4 insertions(+), 4 deletions(-) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/.env (100%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/data.yml (100%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/docker-compose.yml (87%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/envs/default.env (100%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/envs/global.env (100%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/init.sh (100%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/uninstall.sh (100%) rename appstore/immich-machine-learning/{2.0.1 => 2.1.0}/scripts/upgrade.sh (100%) diff --git a/appstore/immich-machine-learning/2.0.1/.env b/appstore/immich-machine-learning/2.1.0/.env similarity index 100% rename from appstore/immich-machine-learning/2.0.1/.env rename to appstore/immich-machine-learning/2.1.0/.env diff --git a/appstore/immich-machine-learning/2.0.1/data.yml b/appstore/immich-machine-learning/2.1.0/data.yml similarity index 100% rename from appstore/immich-machine-learning/2.0.1/data.yml rename to appstore/immich-machine-learning/2.1.0/data.yml diff --git a/appstore/immich-machine-learning/2.0.1/docker-compose.yml b/appstore/immich-machine-learning/2.1.0/docker-compose.yml similarity index 87% rename from appstore/immich-machine-learning/2.0.1/docker-compose.yml rename to appstore/immich-machine-learning/2.1.0/docker-compose.yml index c77f152ea..854f49abb 100644 --- a/appstore/immich-machine-learning/2.0.1/docker-compose.yml +++ b/appstore/immich-machine-learning/2.1.0/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 + image: ghcr.io/immich-app/immich-machine-learning:v2.1.0 labels: createdBy: Apps networks: diff --git a/appstore/immich-machine-learning/2.0.1/envs/default.env b/appstore/immich-machine-learning/2.1.0/envs/default.env similarity index 100% rename from appstore/immich-machine-learning/2.0.1/envs/default.env rename to appstore/immich-machine-learning/2.1.0/envs/default.env diff --git a/appstore/immich-machine-learning/2.0.1/envs/global.env b/appstore/immich-machine-learning/2.1.0/envs/global.env similarity index 100% rename from appstore/immich-machine-learning/2.0.1/envs/global.env rename to appstore/immich-machine-learning/2.1.0/envs/global.env diff --git a/appstore/immich-machine-learning/2.0.1/scripts/init.sh b/appstore/immich-machine-learning/2.1.0/scripts/init.sh similarity index 100% rename from appstore/immich-machine-learning/2.0.1/scripts/init.sh rename to appstore/immich-machine-learning/2.1.0/scripts/init.sh diff --git a/appstore/immich-machine-learning/2.0.1/scripts/uninstall.sh b/appstore/immich-machine-learning/2.1.0/scripts/uninstall.sh similarity index 100% rename from appstore/immich-machine-learning/2.0.1/scripts/uninstall.sh rename to appstore/immich-machine-learning/2.1.0/scripts/uninstall.sh diff --git a/appstore/immich-machine-learning/2.0.1/scripts/upgrade.sh b/appstore/immich-machine-learning/2.1.0/scripts/upgrade.sh similarity index 100% rename from appstore/immich-machine-learning/2.0.1/scripts/upgrade.sh rename to appstore/immich-machine-learning/2.1.0/scripts/upgrade.sh diff --git a/appstore/immich/2.1.0/docker-compose.yml b/appstore/immich/2.1.0/docker-compose.yml index 803c81183..438accd35 100644 --- a/appstore/immich/2.1.0/docker-compose.yml +++ b/appstore/immich/2.1.0/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 + image: ghcr.io/immich-app/immich-machine-learning:v2.1.0 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning/docker-compose.yml b/dockge/immich-machine-learning/docker-compose.yml index c77f152ea..854f49abb 100644 --- a/dockge/immich-machine-learning/docker-compose.yml +++ b/dockge/immich-machine-learning/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 + image: ghcr.io/immich-app/immich-machine-learning:v2.1.0 labels: createdBy: Apps networks: diff --git a/dockge/immich/docker-compose.yml b/dockge/immich/docker-compose.yml index 803c81183..438accd35 100644 --- a/dockge/immich/docker-compose.yml +++ b/dockge/immich/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v2.0.1 + image: ghcr.io/immich-app/immich-machine-learning:v2.1.0 labels: createdBy: Apps networks: From 0959d9f1b14858b061e9741650c473175a2f8abe Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 16 Oct 2025 18:31:13 +0000 Subject: [PATCH 189/262] Processed apps directory via GitHub Actions --- dockge/affine/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-aria2/.env | 2 +- dockge/alist-aria2/docker-compose.yml | 6 +- .../{alist_3_45_0 => alist-aria2_4_0_2}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-ffmpeg/.env | 2 +- dockge/alist-ffmpeg/docker-compose.yml | 6 +- .../.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist/.env | 2 +- dockge/alist/docker-compose.yml | 6 +- .../{alist-ffmpeg_3_45_0 => alist_4_0_2}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/archivebox/docker-compose.yml | 24 +- .../.env | 0 .../docker-compose.yml | 24 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/baota/docker-compose.yml | 2 +- dockge/{baota_9_0 => baota_10_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../{baota_9_0 => baota_10_0}/envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/emby/docker-compose.yml | 2 +- dockge/{emby_4_9_2_4 => emby_4_8_11_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/homarr/.env | 2 +- dockge/homarr/docker-compose.yml | 2 +- dockge/{homarr_1_41_0 => homarr_0_16_0}/.env | 2 +- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/iyuu-plus/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/minio/.env | 5 +- dockge/minio/docker-compose.yml | 6 +- .../.env | 5 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/moontv/.env | 3 - dockge/moontv/docker-compose.yml | 2 +- dockge/{moontv_latest => moontv_4_3_0}/.env | 3 + .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql/config/my.cnf | 34 +- dockge/mysql/docker-compose.yml | 11 +- dockge/mysql_5_7_44/config/my.cnf | 42 - dockge/{mysql_5_7_44 => mysql_8_4_6}/.env | 0 dockge/mysql_8_4_6/config/my.cnf | 20 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/nacos/docker-compose.yml | 2 +- dockge/{nacos_2_4_3 => nacos_2_5_1}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 0 dockge/postgresql-postgis/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/qbittorrent/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/redis/config/redis.conf | 759 +++++++++++++----- dockge/redis/docker-compose.yml | 2 +- dockge/{redis_7_4_6 => redis_6_2_20}/.env | 0 .../config/redis.conf | 759 +++++------------- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-backend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-frontend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec/docker-compose.yml | 4 +- .../{stream-rec_0_7_2 => stream-rec_dev}/.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma/.env | 6 - dockge/uptime-kuma/docker-compose.yml | 11 +- dockge/uptime-kuma_1_23_16/.env | 12 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma_2_0_0/.env | 6 - 140 files changed, 945 insertions(+), 945 deletions(-) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/.env (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/docker-compose.yml (94%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/envs/default.env (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/envs/global.env (100%) rename dockge/{alist_3_45_0 => alist-aria2_4_0_2}/.env (93%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/docker-compose.yml (85%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/envs/default.env (100%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/envs/global.env (100%) rename dockge/{alist-aria2_3_40_0 => alist-ffmpeg_4_0_2}/.env (93%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/docker-compose.yml (85%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/envs/default.env (100%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/envs/global.env (100%) rename dockge/{alist-ffmpeg_3_45_0 => alist_4_0_2}/.env (93%) rename dockge/{alist_3_45_0 => alist_4_0_2}/docker-compose.yml (86%) rename dockge/{alist_3_45_0 => alist_4_0_2}/envs/default.env (100%) rename dockge/{alist_3_45_0 => alist_4_0_2}/envs/global.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/docker-compose.yml (60%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/envs/default.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/envs/global.env (100%) rename dockge/{baota_9_0 => baota_10_0}/.env (100%) rename dockge/{baota_9_0 => baota_10_0}/docker-compose.yml (92%) rename dockge/{baota_9_0 => baota_10_0}/envs/default.env (100%) rename dockge/{baota_9_0 => baota_10_0}/envs/global.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/categories.json (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/template.html (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/docker-compose.yml (88%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/envs/default.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/envs/global.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/docker-compose.yml (95%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/envs/default.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/envs/global.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/docker-compose.yml (96%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/envs/default.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/envs/global.env (100%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/.env (67%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/docker-compose.yml (89%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/envs/default.env (100%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/envs/global.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/docker-compose.yml (95%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/envs/default.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/envs/global.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/.env (86%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/docker-compose.yml (83%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/envs/default.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/envs/global.env (100%) rename dockge/{moontv_latest => moontv_4_3_0}/.env (95%) rename dockge/{moontv_latest => moontv_4_3_0}/docker-compose.yml (87%) rename dockge/{moontv_latest => moontv_4_3_0}/envs/default.env (100%) rename dockge/{moontv_latest => moontv_4_3_0}/envs/global.env (100%) delete mode 100644 dockge/mysql_5_7_44/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_6}/.env (100%) create mode 100644 dockge/mysql_8_4_6/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_6}/docker-compose.yml (65%) rename dockge/{mysql_5_7_44 => mysql_8_4_6}/envs/default.env (100%) rename dockge/{mysql_5_7_44 => mysql_8_4_6}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/docker-compose.yml (94%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/envs/default.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/init/mysql-schema.sql (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/.env (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/docker-compose.yml (94%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/envs/default.env (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/envs/global.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/docker-compose.yml (89%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/envs/default.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/envs/global.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/docker-compose.yml (95%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/envs/default.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/envs/global.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/config/redis.conf (72%) rename dockge/{redis_7_4_6 => redis_6_2_20}/docker-compose.yml (94%) rename dockge/{redis_7_4_6 => redis_6_2_20}/envs/default.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/envs/global.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/docker-compose.yml (92%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/envs/default.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/envs/global.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/docker-compose.yml (87%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/envs/default.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/envs/global.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/docker-compose.yml (92%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/envs/default.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/envs/global.env (100%) create mode 100644 dockge/uptime-kuma_1_23_16/.env rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/docker-compose.yml (57%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/default.env (100%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/global.env (100%) delete mode 100644 dockge/uptime-kuma_2_0_0/.env diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/.env b/dockge/affine_stable-1623f5d/.env similarity index 100% rename from dockge/affine_stable-e98f035/.env rename to dockge/affine_stable-1623f5d/.env diff --git a/dockge/affine_stable-e98f035/docker-compose.yml b/dockge/affine_stable-1623f5d/docker-compose.yml similarity index 94% rename from dockge/affine_stable-e98f035/docker-compose.yml rename to dockge/affine_stable-1623f5d/docker-compose.yml index 94a383ee2..18926413f 100644 --- a/dockge/affine_stable-e98f035/docker-compose.yml +++ b/dockge/affine_stable-1623f5d/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/envs/default.env b/dockge/affine_stable-1623f5d/envs/default.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/default.env rename to dockge/affine_stable-1623f5d/envs/default.env diff --git a/dockge/affine_stable-e98f035/envs/global.env b/dockge/affine_stable-1623f5d/envs/global.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/global.env rename to dockge/affine_stable-1623f5d/envs/global.env diff --git a/dockge/alist-aria2/.env b/dockge/alist-aria2/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-aria2/.env +++ b/dockge/alist-aria2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index d11a2d481..a6913980a 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist-aria2: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-aria2 + image: qyg2297248353/alist-aria2:v3.40.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_3_45_0/.env b/dockge/alist-aria2_4_0_2/.env similarity index 93% rename from dockge/alist_3_45_0/.env rename to dockge/alist-aria2_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist_3_45_0/.env +++ b/dockge/alist-aria2_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2_3_40_0/docker-compose.yml b/dockge/alist-aria2_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-aria2_3_40_0/docker-compose.yml rename to dockge/alist-aria2_4_0_2/docker-compose.yml index a6913980a..d11a2d481 100644 --- a/dockge/alist-aria2_3_40_0/docker-compose.yml +++ b/dockge/alist-aria2_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist-aria2: + openlist: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist-aria2:v3.40.0 + image: openlistteam/openlist:v4.0.2-aria2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_3_40_0/envs/default.env b/dockge/alist-aria2_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-aria2_3_40_0/envs/default.env rename to dockge/alist-aria2_4_0_2/envs/default.env diff --git a/dockge/alist-aria2_3_40_0/envs/global.env b/dockge/alist-aria2_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-aria2_3_40_0/envs/global.env rename to dockge/alist-aria2_4_0_2/envs/global.env diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index ded9a5b7e..37149a612 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_3_40_0/.env b/dockge/alist-ffmpeg_4_0_2/.env similarity index 93% rename from dockge/alist-aria2_3_40_0/.env rename to dockge/alist-ffmpeg_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-aria2_3_40_0/.env +++ b/dockge/alist-ffmpeg_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_3_45_0/docker-compose.yml rename to dockge/alist-ffmpeg_4_0_2/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml +++ b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: openlistteam/openlist:v4.0.2-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_3_45_0/envs/default.env b/dockge/alist-ffmpeg_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/default.env rename to dockge/alist-ffmpeg_4_0_2/envs/default.env diff --git a/dockge/alist-ffmpeg_3_45_0/envs/global.env b/dockge/alist-ffmpeg_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/global.env rename to dockge/alist-ffmpeg_4_0_2/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_3_45_0/.env b/dockge/alist_4_0_2/.env similarity index 93% rename from dockge/alist-ffmpeg_3_45_0/.env rename to dockge/alist_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg_3_45_0/.env +++ b/dockge/alist_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist_3_45_0/docker-compose.yml b/dockge/alist_4_0_2/docker-compose.yml similarity index 86% rename from dockge/alist_3_45_0/docker-compose.yml rename to dockge/alist_4_0_2/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist_3_45_0/docker-compose.yml +++ b/dockge/alist_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: openlistteam/openlist:v4.0.2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_3_45_0/envs/default.env b/dockge/alist_4_0_2/envs/default.env similarity index 100% rename from dockge/alist_3_45_0/envs/default.env rename to dockge/alist_4_0_2/envs/default.env diff --git a/dockge/alist_3_45_0/envs/global.env b/dockge/alist_4_0_2/envs/global.env similarity index 100% rename from dockge/alist_3_45_0/envs/global.env rename to dockge/alist_4_0_2/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index f70ce3cc2..ac22205db 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: archivebox: container_name: archivebox + depends_on: + - archivebox-init env_file: - ./envs/global.env - .env @@ -14,7 +16,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.7.3 + image: archivebox/archivebox:0.8.5rc51 labels: createdBy: Apps networks: @@ -24,6 +26,26 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data + archivebox-init: + command: archivebox init + container_name: init-archivebox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - ALLOWED_HOSTS=* + - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - SEARCH_BACKEND_ENGINE=sonic + - SEARCH_BACKEND_HOST_NAME=archivebox-sonic + - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} + image: archivebox/archivebox:0.8.5rc51 + labels: + createdBy: Apps + networks: + - 1panel-network + volumes: + - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_8_5rc51/.env b/dockge/archivebox_0_7_3/.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/.env rename to dockge/archivebox_0_7_3/.env diff --git a/dockge/archivebox_0_8_5rc51/docker-compose.yml b/dockge/archivebox_0_7_3/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_8_5rc51/docker-compose.yml rename to dockge/archivebox_0_7_3/docker-compose.yml index ac22205db..f70ce3cc2 100644 --- a/dockge/archivebox_0_8_5rc51/docker-compose.yml +++ b/dockge/archivebox_0_7_3/docker-compose.yml @@ -4,8 +4,6 @@ networks: services: archivebox: container_name: archivebox - depends_on: - - archivebox-init env_file: - ./envs/global.env - .env @@ -16,7 +14,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 + image: archivebox/archivebox:0.7.3 labels: createdBy: Apps networks: @@ -26,26 +24,6 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data - archivebox-init: - command: archivebox init - container_name: init-archivebox - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - ALLOWED_HOSTS=* - - CSRF_TRUSTED_ORIGINS=http://localhost:8000 - - SEARCH_BACKEND_ENGINE=sonic - - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 - labels: - createdBy: Apps - networks: - - 1panel-network - volumes: - - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_8_5rc51/envs/default.env b/dockge/archivebox_0_7_3/envs/default.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/envs/default.env rename to dockge/archivebox_0_7_3/envs/default.env diff --git a/dockge/archivebox_0_8_5rc51/envs/global.env b/dockge/archivebox_0_7_3/envs/global.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/envs/global.env rename to dockge/archivebox_0_7_3/envs/global.env diff --git a/dockge/baota/docker-compose.yml b/dockge/baota/docker-compose.yml index 678152df3..c28254802 100644 --- a/dockge/baota/docker-compose.yml +++ b/dockge/baota/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:10.0_lts + image: btpanel/baota:9.0_lts_latest labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_9_0/.env b/dockge/baota_10_0/.env similarity index 100% rename from dockge/baota_9_0/.env rename to dockge/baota_10_0/.env diff --git a/dockge/baota_9_0/docker-compose.yml b/dockge/baota_10_0/docker-compose.yml similarity index 92% rename from dockge/baota_9_0/docker-compose.yml rename to dockge/baota_10_0/docker-compose.yml index c28254802..678152df3 100644 --- a/dockge/baota_9_0/docker-compose.yml +++ b/dockge/baota_10_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:9.0_lts_latest + image: btpanel/baota:10.0_lts labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_9_0/envs/default.env b/dockge/baota_10_0/envs/default.env similarity index 100% rename from dockge/baota_9_0/envs/default.env rename to dockge/baota_10_0/envs/default.env diff --git a/dockge/baota_9_0/envs/global.env b/dockge/baota_10_0/envs/global.env similarity index 100% rename from dockge/baota_9_0/envs/global.env rename to dockge/baota_10_0/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index af4782f89..c68c76b14 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.8 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.8 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/.env b/dockge/bili-fetcher_1_6_8/.env similarity index 100% rename from dockge/bili-fetcher_latest/.env rename to dockge/bili-fetcher_1_6_8/.env diff --git a/dockge/bili-fetcher_latest/config/categories.json b/dockge/bili-fetcher_1_6_8/config/categories.json similarity index 100% rename from dockge/bili-fetcher_latest/config/categories.json rename to dockge/bili-fetcher_1_6_8/config/categories.json diff --git a/dockge/bili-fetcher_latest/config/config.yaml b/dockge/bili-fetcher_1_6_8/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/config.yaml rename to dockge/bili-fetcher_1_6_8/config/config.yaml diff --git a/dockge/bili-fetcher_latest/config/scheduler_config.yaml b/dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/scheduler_config.yaml rename to dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_latest/config/sql_statements_mysql.py b/dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_mysql.py rename to dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py b/dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_latest/config/template.html b/dockge/bili-fetcher_1_6_8/config/template.html similarity index 100% rename from dockge/bili-fetcher_latest/config/template.html rename to dockge/bili-fetcher_1_6_8/config/template.html diff --git a/dockge/bili-fetcher_latest/docker-compose.yml b/dockge/bili-fetcher_1_6_8/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_latest/docker-compose.yml rename to dockge/bili-fetcher_1_6_8/docker-compose.yml index c68c76b14..af4782f89 100644 --- a/dockge/bili-fetcher_latest/docker-compose.yml +++ b/dockge/bili-fetcher_1_6_8/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/envs/default.env b/dockge/bili-fetcher_1_6_8/envs/default.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/default.env rename to dockge/bili-fetcher_1_6_8/envs/default.env diff --git a/dockge/bili-fetcher_latest/envs/global.env b/dockge/bili-fetcher_1_6_8/envs/global.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/global.env rename to dockge/bili-fetcher_1_6_8/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index d618229ca..095cf8284 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.5 + image: elasticsearch:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_5/.env b/dockge/elastic-elasticsearch_8_19_5/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/.env rename to dockge/elastic-elasticsearch_8_19_5/.env diff --git a/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml b/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_1_5/docker-compose.yml rename to dockge/elastic-elasticsearch_8_19_5/docker-compose.yml index 095cf8284..d618229ca 100644 --- a/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml +++ b/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.1.5 + image: elasticsearch:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_5/envs/default.env b/dockge/elastic-elasticsearch_8_19_5/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/envs/default.env rename to dockge/elastic-elasticsearch_8_19_5/envs/default.env diff --git a/dockge/elastic-elasticsearch_9_1_5/envs/global.env b/dockge/elastic-elasticsearch_8_19_5/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/envs/global.env rename to dockge/elastic-elasticsearch_8_19_5/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index c7d0828cd..1a784d0e3 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.19.5 + image: kibana:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_5/.env b/dockge/elastic-kibana_8_19_5/.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/.env rename to dockge/elastic-kibana_8_19_5/.env diff --git a/dockge/elastic-kibana_9_1_5/docker-compose.yml b/dockge/elastic-kibana_8_19_5/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_9_1_5/docker-compose.yml rename to dockge/elastic-kibana_8_19_5/docker-compose.yml index 1a784d0e3..c7d0828cd 100644 --- a/dockge/elastic-kibana_9_1_5/docker-compose.yml +++ b/dockge/elastic-kibana_8_19_5/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.1.5 + image: kibana:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_5/envs/default.env b/dockge/elastic-kibana_8_19_5/envs/default.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/envs/default.env rename to dockge/elastic-kibana_8_19_5/envs/default.env diff --git a/dockge/elastic-kibana_9_1_5/envs/global.env b/dockge/elastic-kibana_8_19_5/envs/global.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/envs/global.env rename to dockge/elastic-kibana_8_19_5/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index a461e63ac..1e9567477 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_4/.env b/dockge/emby_4_8_11_0/.env similarity index 100% rename from dockge/emby_4_9_2_4/.env rename to dockge/emby_4_8_11_0/.env diff --git a/dockge/emby_4_9_2_4/docker-compose.yml b/dockge/emby_4_8_11_0/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_2_4/docker-compose.yml rename to dockge/emby_4_8_11_0/docker-compose.yml index 1e9567477..a461e63ac 100644 --- a/dockge/emby_4_9_2_4/docker-compose.yml +++ b/dockge/emby_4_8_11_0/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_4/envs/default.env b/dockge/emby_4_8_11_0/envs/default.env similarity index 100% rename from dockge/emby_4_9_2_4/envs/default.env rename to dockge/emby_4_8_11_0/envs/default.env diff --git a/dockge/emby_4_9_2_4/envs/global.env b/dockge/emby_4_8_11_0/envs/global.env similarity index 100% rename from dockge/emby_4_9_2_4/envs/global.env rename to dockge/emby_4_8_11_0/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 8568f94b3..06b42b32c 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_41_0/.env b/dockge/homarr_0_16_0/.env similarity index 67% rename from dockge/homarr_1_41_0/.env rename to dockge/homarr_0_16_0/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr_1_41_0/.env +++ b/dockge/homarr_0_16_0/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr_1_41_0/docker-compose.yml b/dockge/homarr_0_16_0/docker-compose.yml similarity index 89% rename from dockge/homarr_1_41_0/docker-compose.yml rename to dockge/homarr_0_16_0/docker-compose.yml index 06b42b32c..8568f94b3 100644 --- a/dockge/homarr_1_41_0/docker-compose.yml +++ b/dockge/homarr_0_16_0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/ajnart/homarr:0.16.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_41_0/envs/default.env b/dockge/homarr_0_16_0/envs/default.env similarity index 100% rename from dockge/homarr_1_41_0/envs/default.env rename to dockge/homarr_0_16_0/envs/default.env diff --git a/dockge/homarr_1_41_0/envs/global.env b/dockge/homarr_0_16_0/envs/global.env similarity index 100% rename from dockge/homarr_1_41_0/envs/global.env rename to dockge/homarr_0_16_0/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus/docker-compose.yml +++ b/dockge/iyuu-plus/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus:latest + image: iyuucn/iyuuplus-nodb:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/.env b/dockge/iyuu-plus_latest-mysql/.env similarity index 100% rename from dockge/iyuu-plus_latest/.env rename to dockge/iyuu-plus_latest-mysql/.env diff --git a/dockge/iyuu-plus_latest/docker-compose.yml b/dockge/iyuu-plus_latest-mysql/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest/docker-compose.yml rename to dockge/iyuu-plus_latest-mysql/docker-compose.yml index 39b4c1ba0..142aaa4d5 100644 --- a/dockge/iyuu-plus_latest/docker-compose.yml +++ b/dockge/iyuu-plus_latest-mysql/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/envs/default.env b/dockge/iyuu-plus_latest-mysql/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/default.env rename to dockge/iyuu-plus_latest-mysql/envs/default.env diff --git a/dockge/iyuu-plus_latest/envs/global.env b/dockge/iyuu-plus_latest-mysql/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/global.env rename to dockge/iyuu-plus_latest-mysql/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.env @@ -4,12 +4,9 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 (映射内部端口) [必填] +# API 端口 [必填] PANEL_APP_PORT_API=9000 -# API 内部端口 [必填] -MINIO_API_PORT=9000 - # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/.env b/dockge/minio_2025-09-07/.env similarity index 86% rename from dockge/minio_2025-04-22/.env rename to dockge/minio_2025-09-07/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio_2025-04-22/.env +++ b/dockge/minio_2025-09-07/.env @@ -4,9 +4,12 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 [必填] +# API 端口 (映射内部端口) [必填] PANEL_APP_PORT_API=9000 +# API 内部端口 [必填] +MINIO_API_PORT=9000 + # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio_2025-04-22/docker-compose.yml b/dockge/minio_2025-09-07/docker-compose.yml similarity index 83% rename from dockge/minio_2025-04-22/docker-compose.yml rename to dockge/minio_2025-09-07/docker-compose.yml index 2bc78e830..4e37e835a 100644 --- a/dockge/minio_2025-04-22/docker-compose.yml +++ b/dockge/minio_2025-09-07/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-09-07T16-13-09Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/envs/default.env b/dockge/minio_2025-09-07/envs/default.env similarity index 100% rename from dockge/minio_2025-04-22/envs/default.env rename to dockge/minio_2025-09-07/envs/default.env diff --git a/dockge/minio_2025-04-22/envs/global.env b/dockge/minio_2025-09-07/envs/global.env similarity index 100% rename from dockge/minio_2025-04-22/envs/global.env rename to dockge/minio_2025-09-07/envs/global.env diff --git a/dockge/moontv/.env b/dockge/moontv/.env index c1e2d49fa..4f33d3980 100644 --- a/dockge/moontv/.env +++ b/dockge/moontv/.env @@ -4,9 +4,6 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 -# Authorization Code [必填] -AUTH_TOKEN= - # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv/docker-compose.yml b/dockge/moontv/docker-compose.yml index 399cbb8a3..eedce5001 100644 --- a/dockge/moontv/docker-compose.yml +++ b/dockge/moontv/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:4.3.0 + image: ghcr.io/moontechlab/lunatv:latest labels: createdBy: Apps networks: diff --git a/dockge/moontv_latest/.env b/dockge/moontv_4_3_0/.env similarity index 95% rename from dockge/moontv_latest/.env rename to dockge/moontv_4_3_0/.env index 4f33d3980..c1e2d49fa 100644 --- a/dockge/moontv_latest/.env +++ b/dockge/moontv_4_3_0/.env @@ -4,6 +4,9 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 +# Authorization Code [必填] +AUTH_TOKEN= + # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv_latest/docker-compose.yml b/dockge/moontv_4_3_0/docker-compose.yml similarity index 87% rename from dockge/moontv_latest/docker-compose.yml rename to dockge/moontv_4_3_0/docker-compose.yml index eedce5001..399cbb8a3 100644 --- a/dockge/moontv_latest/docker-compose.yml +++ b/dockge/moontv_4_3_0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:latest + image: ghcr.io/moontechlab/lunatv:4.3.0 labels: createdBy: Apps networks: diff --git a/dockge/moontv_latest/envs/default.env b/dockge/moontv_4_3_0/envs/default.env similarity index 100% rename from dockge/moontv_latest/envs/default.env rename to dockge/moontv_4_3_0/envs/default.env diff --git a/dockge/moontv_latest/envs/global.env b/dockge/moontv_4_3_0/envs/global.env similarity index 100% rename from dockge/moontv_latest/envs/global.env rename to dockge/moontv_4_3_0/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index c53ca32dc..6d6e1a932 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,20 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + [mysqld] -host_cache_size=0 +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files user=mysql -mysql_native_password=ON +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 -log_bin_trust_function_creators=1 -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index ba5d56398..5cac14f48 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.6 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf deleted file mode 100644 index 6d6e1a932..000000000 --- a/dockge/mysql_5_7_44/config/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files -user=mysql - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M -character_set_server=utf8mb4 -lower_case_table_names=1 -group_concat_max_len=1024000 - -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_5_7_44/.env b/dockge/mysql_8_4_6/.env similarity index 100% rename from dockge/mysql_5_7_44/.env rename to dockge/mysql_8_4_6/.env diff --git a/dockge/mysql_8_4_6/config/my.cnf b/dockge/mysql_8_4_6/config/my.cnf new file mode 100644 index 000000000..c53ca32dc --- /dev/null +++ b/dockge/mysql_8_4_6/config/my.cnf @@ -0,0 +1,20 @@ +[mysqld] +host_cache_size=0 +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +user=mysql + +mysql_native_password=ON +character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci +lower_case_table_names=1 +group_concat_max_len=1024000 +log_bin_trust_function_creators=1 + +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ diff --git a/dockge/mysql_5_7_44/docker-compose.yml b/dockge/mysql_8_4_6/docker-compose.yml similarity index 65% rename from dockge/mysql_5_7_44/docker-compose.yml rename to dockge/mysql_8_4_6/docker-compose.yml index 5cac14f48..ba5d56398 100644 --- a/dockge/mysql_5_7_44/docker-compose.yml +++ b/dockge/mysql_8_4_6/docker-compose.yml @@ -5,14 +5,13 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --lower_case_table_names=1 - - --collation-server=utf8mb4_general_ci - - --explicit_defaults_for_timestamp=true + - --collation-server=utf8mb4_unicode_ci + - --mysql-native-password=ON container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:5.7.44 + image: mysql:8.4.6 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/envs/default.env b/dockge/mysql_8_4_6/envs/default.env similarity index 100% rename from dockge/mysql_5_7_44/envs/default.env rename to dockge/mysql_8_4_6/envs/default.env diff --git a/dockge/mysql_5_7_44/envs/global.env b/dockge/mysql_8_4_6/envs/global.env similarity index 100% rename from dockge/mysql_5_7_44/envs/global.env rename to dockge/mysql_8_4_6/envs/global.env diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 7e925e038..cf220b000 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/.env b/dockge/nacos_2_5_1/.env similarity index 100% rename from dockge/nacos_2_4_3/.env rename to dockge/nacos_2_5_1/.env diff --git a/dockge/nacos_2_4_3/docker-compose.yml b/dockge/nacos_2_5_1/docker-compose.yml similarity index 94% rename from dockge/nacos_2_4_3/docker-compose.yml rename to dockge/nacos_2_5_1/docker-compose.yml index cf220b000..7e925e038 100644 --- a/dockge/nacos_2_4_3/docker-compose.yml +++ b/dockge/nacos_2_5_1/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/envs/default.env b/dockge/nacos_2_5_1/envs/default.env similarity index 100% rename from dockge/nacos_2_4_3/envs/default.env rename to dockge/nacos_2_5_1/envs/default.env diff --git a/dockge/nacos_2_4_3/envs/global.env b/dockge/nacos_2_5_1/envs/global.env similarity index 100% rename from dockge/nacos_2_4_3/envs/global.env rename to dockge/nacos_2_5_1/envs/global.env diff --git a/dockge/nacos_2_4_3/init/mysql-schema.sql b/dockge/nacos_2_5_1/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_2_4_3/init/mysql-schema.sql rename to dockge/nacos_2_5_1/init/mysql-schema.sql diff --git a/dockge/postgresql-postgis/docker-compose.yml b/dockge/postgresql-postgis/docker-compose.yml index a2cced821..eded4fd3c 100644 --- a/dockge/postgresql-postgis/docker-compose.yml +++ b/dockge/postgresql-postgis/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:17-3.5 + image: postgis/postgis:16-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_16-3_5/.env b/dockge/postgresql-postgis_17-3_5/.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/.env rename to dockge/postgresql-postgis_17-3_5/.env diff --git a/dockge/postgresql-postgis_16-3_5/docker-compose.yml b/dockge/postgresql-postgis_17-3_5/docker-compose.yml similarity index 94% rename from dockge/postgresql-postgis_16-3_5/docker-compose.yml rename to dockge/postgresql-postgis_17-3_5/docker-compose.yml index eded4fd3c..a2cced821 100644 --- a/dockge/postgresql-postgis_16-3_5/docker-compose.yml +++ b/dockge/postgresql-postgis_17-3_5/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:16-3.5 + image: postgis/postgis:17-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_16-3_5/envs/default.env b/dockge/postgresql-postgis_17-3_5/envs/default.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/envs/default.env rename to dockge/postgresql-postgis_17-3_5/envs/default.env diff --git a/dockge/postgresql-postgis_16-3_5/envs/global.env b/dockge/postgresql-postgis_17-3_5/envs/global.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/envs/global.env rename to dockge/postgresql-postgis_17-3_5/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 9724e766c..e8ef19ae8 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:14 + image: postgres:17.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_6-alpine/.env b/dockge/postgresql_pg14/.env similarity index 100% rename from dockge/postgresql_17_6-alpine/.env rename to dockge/postgresql_pg14/.env diff --git a/dockge/postgresql_17_6-alpine/docker-compose.yml b/dockge/postgresql_pg14/docker-compose.yml similarity index 89% rename from dockge/postgresql_17_6-alpine/docker-compose.yml rename to dockge/postgresql_pg14/docker-compose.yml index e8ef19ae8..9724e766c 100644 --- a/dockge/postgresql_17_6-alpine/docker-compose.yml +++ b/dockge/postgresql_pg14/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg14-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:17.6-alpine + image: postgres:14 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_6-alpine/envs/default.env b/dockge/postgresql_pg14/envs/default.env similarity index 100% rename from dockge/postgresql_17_6-alpine/envs/default.env rename to dockge/postgresql_pg14/envs/default.env diff --git a/dockge/postgresql_17_6-alpine/envs/global.env b/dockge/postgresql_pg14/envs/global.env similarity index 100% rename from dockge/postgresql_17_6-alpine/envs/global.env rename to dockge/postgresql_pg14/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 116044519..5ec4b458b 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/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.1.2 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/.env b/dockge/qbittorrent_5_1_2/.env similarity index 100% rename from dockge/qbittorrent_4_6_7/.env rename to dockge/qbittorrent_5_1_2/.env diff --git a/dockge/qbittorrent_4_6_7/docker-compose.yml b/dockge/qbittorrent_5_1_2/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_4_6_7/docker-compose.yml rename to dockge/qbittorrent_5_1_2/docker-compose.yml index 5ec4b458b..116044519 100644 --- a/dockge/qbittorrent_4_6_7/docker-compose.yml +++ b/dockge/qbittorrent_5_1_2/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:4.6.7 + image: linuxserver/qbittorrent:5.1.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/envs/default.env b/dockge/qbittorrent_5_1_2/envs/default.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/default.env rename to dockge/qbittorrent_5_1_2/envs/default.env diff --git a/dockge/qbittorrent_4_6_7/envs/global.env b/dockge/qbittorrent_5_1_2/envs/global.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/global.env rename to dockge/qbittorrent_5_1_2/envs/global.env diff --git a/dockge/redis/config/redis.conf b/dockge/redis/config/redis.conf index ca22ec9f6..8795ae291 100644 --- a/dockge/redis/config/redis.conf +++ b/dockge/redis/config/redis.conf @@ -32,8 +32,17 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# # include /path/to/local.conf # include /path/to/other.conf +# include /path/to/fragments/*.conf +# ################################## MODULES ##################################### @@ -49,43 +58,81 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 -# bind 127.0.0.1 ::1 +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 loopback interface address (this means Redis will only be able to -# accept client connections from the same host that it is running on). +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# JUST COMMENT OUT THE FOLLOWING LINE. +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and if: -# -# 1) The server is not binding explicitly to a set of addresses using the -# "bind" directive. -# 2) No password is configured. -# -# The server only accepts connections from clients connecting from the -# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain -# sockets. +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured, nor a specific set of interfaces -# are explicitly listed using the "bind" directive. +# even if no authentication is configured. protected-mode yes +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -105,7 +152,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /tmp/redis.sock +# unixsocket /run/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -128,6 +175,16 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -143,8 +200,32 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. # # tls-dh-params-file redis.dh @@ -177,9 +258,12 @@ tcp-keepalive 300 # # tls-cluster yes -# Explicitly specify TLS versions to support. Allowed values are case insensitive -# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -221,6 +305,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -229,11 +314,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -244,6 +335,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -269,44 +363,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -338,6 +462,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -412,9 +551,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -463,7 +603,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -477,12 +617,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -491,19 +637,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -578,6 +728,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -633,7 +820,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -697,8 +884,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -706,10 +897,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -717,8 +909,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -737,6 +938,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -758,6 +967,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -787,8 +1030,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -877,14 +1136,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -901,6 +1158,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -994,6 +1259,13 @@ replica-lazy-flush no lazyfree-lazy-user-del no +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1032,7 +1304,7 @@ lazyfree-lazy-user-del no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1050,7 +1322,7 @@ lazyfree-lazy-user-del no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1071,6 +1343,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1089,14 +1374,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1136,7 +1450,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1189,34 +1503,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1240,6 +1589,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1298,12 +1652,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1318,7 +1681,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1328,7 +1691,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1343,8 +1706,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1354,16 +1763,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1376,7 +1790,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1424,10 +1839,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1449,9 +1878,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1474,71 +1905,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1553,7 +1926,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1581,8 +1954,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1604,7 +1977,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1637,7 +2010,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1661,6 +2034,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1674,6 +2054,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1714,13 +2113,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1817,7 +2216,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis/docker-compose.yml b/dockge/redis/docker-compose.yml index 414c1b027..fe930bde8 100644 --- a/dockge/redis/docker-compose.yml +++ b/dockge/redis/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:6.2.20-alpine + image: redis:7.4.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_7_4_6/.env b/dockge/redis_6_2_20/.env similarity index 100% rename from dockge/redis_7_4_6/.env rename to dockge/redis_6_2_20/.env diff --git a/dockge/redis_7_4_6/config/redis.conf b/dockge/redis_6_2_20/config/redis.conf similarity index 72% rename from dockge/redis_7_4_6/config/redis.conf rename to dockge/redis_6_2_20/config/redis.conf index 8795ae291..ca22ec9f6 100644 --- a/dockge/redis_7_4_6/config/redis.conf +++ b/dockge/redis_6_2_20/config/redis.conf @@ -32,17 +32,8 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # -# Included paths may contain wildcards. All files matching the wildcards will -# be included in alphabetical order. -# Note that if an include path contains a wildcards but no files match it when -# the server is started, the include statement will be ignored and no error will -# be emitted. It is safe, therefore, to include wildcard files from empty -# directories. -# # include /path/to/local.conf # include /path/to/other.conf -# include /path/to/fragments/*.conf -# ################################## MODULES ##################################### @@ -58,81 +49,43 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. -# Each address can be prefixed by "-", which means that redis will not fail to -# start if the address is not available. Being not available only refers to -# addresses that does not correspond to any network interface. Addresses that -# are already in use will always fail, and unsupported protocols will always BE -# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses -# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 -# bind * -::* # like the default, all available interfaces +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis -# will only be able to accept client connections from the same host that it is -# running on). +# IPv4 loopback interface address (this means Redis will only be able to +# accept client connections from the same host that it is running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# COMMENT OUT THE FOLLOWING LINE. -# -# You will also need to set a password unless you explicitly disable protected -# mode. +# JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 -# By default, outgoing connections (from replica to master, from Sentinel to -# instances, cluster bus, etc.) are not bound to a specific local address. In -# most cases, this means the operating system will handle that based on routing -# and the interface through which the connection goes out. -# -# Using bind-source-addr it is possible to configure a specific address to bind -# to, which may also affect how the connection gets routed. -# -# Example: -# -# bind-source-addr 10.0.0.1 - # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and the default user has no password, the server -# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address -# (::1) or Unix domain sockets. +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured. +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. protected-mode yes -# Redis uses default hardened security configuration directives to reduce the -# attack surface on innocent users. Therefore, several sensitive configuration -# directives are immutable, and some potentially-dangerous commands are blocked. -# -# Configuration directives that control files that Redis writes to (e.g., 'dir' -# and 'dbfilename') and that aren't usually modified during runtime -# are protected by making them immutable. -# -# Commands that can increase the attack surface of Redis and that aren't usually -# called by users are blocked by default. -# -# These can be exposed to either all connections or just local ones by setting -# each of the configs listed below to either of these values: -# -# no - Block for any connection (remain immutable) -# yes - Allow for any connection (no protection) -# local - Allow only for local connections. Ones originating from the -# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. -# -# enable-protected-configs no -# enable-debug-command no -# enable-module-command no - # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -152,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /run/redis.sock +# unixsocket /tmp/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -175,16 +128,6 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 -# Apply OS-specific mechanism to mark the listening socket with the specified -# ID, to support advanced routing and filtering capabilities. -# -# On Linux, the ID represents a connection mark. -# On FreeBSD, the ID represents a socket cookie ID. -# On OpenBSD, the ID represents a route table ID. -# -# The default value is 0, which implies no marking is required. -# socket-mark-id 0 - ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -200,32 +143,8 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-key-file-pass secret -# Normally Redis uses the same certificate for both server functions (accepting -# connections) and client functions (replicating from a master, establishing -# cluster bus connections, etc.). -# -# Sometimes certificates are issued with attributes that designate them as -# client-only or server-only certificates. In that case it may be desired to use -# different certificates for incoming (server) and outgoing (client) -# connections. To do that, use the following directives: -# -# tls-client-cert-file client.crt -# tls-client-key-file client.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-client-key-file-pass secret - -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, -# required by older versions of OpenSSL (<3.0). Newer versions do not require -# this configuration and recommend against it. +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # # tls-dh-params-file redis.dh @@ -258,12 +177,9 @@ tcp-keepalive 300 # # tls-cluster yes -# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended -# that older formally deprecated versions are kept disabled to reduce the attack surface. -# You can explicitly specify TLS versions to support. -# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", -# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. -# To enable only TLSv1.2 and TLSv1.3, use: +# Explicitly specify TLS versions to support. Allowed values are case insensitive +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or +# any combination. To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -305,7 +221,6 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -314,17 +229,11 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET -# on startup, and updating Redis status on a regular -# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -# -# The default is "no". To run under upstart/systemd, you can simply uncomment -# the line below: -# -# supervised auto +supervised no # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -335,9 +244,6 @@ daemonize no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -# -# Note that on modern Linux systems "/run/redis.pid" is more conforming -# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -363,74 +269,44 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 -# To disable the built in crash log, which will possibly produce cleaner core -# dumps when they are needed, uncomment the following: -# -# crash-log-enabled no - -# To disable the fast memory check that's run as part of the crash log, which -# will possibly let redis terminate sooner, uncomment the following: -# -# crash-memcheck-enabled no - # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY and syslog logging is -# disabled. Basically this means that normally a logo is displayed only in -# interactive sessions. +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo no - -# By default, Redis modifies the process title (as seen in 'top' and 'ps') to -# provide some runtime information. It is possible to disable this and leave -# the process name as executed by setting the following to no. -set-proc-title yes - -# When changing the process title, Redis uses the following template to construct -# the modified title. -# -# Template variables are specified in curly brackets. The following variables are -# supported: -# -# {title} Name of process as executed if parent, or type of child process. -# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or -# Unix socket if only that's available. -# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". -# {port} TCP port listening on, or 0. -# {tls-port} TLS port listening on, or 0. -# {unixsocket} Unix domain socket listening on, or "". -# {config-file} Name of configuration file used. -# -proc-title-template "{title} {listen-addr} {server-mode}" +always-show-logo yes ################################ SNAPSHOTTING ################################ +# +# Save the DB on disk: +# +# save +# +# Will save the DB if both the given number of seconds and the given +# number of write operations against the DB occurred. +# +# In the example below the behavior will be to save: +# after 900 sec (15 min) if at least 1 key changed +# after 300 sec (5 min) if at least 10 keys changed +# after 60 sec if at least 10000 keys changed +# +# Note: you can disable saving completely by commenting out all "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" -# Save the DB to disk. -# -# save [ ...] -# -# Redis will save the DB if the given number of seconds elapsed and it -# surpassed the given number of write operations against the DB. -# -# Snapshotting can be completely disabled with a single empty string argument -# as in following example: -# -# save "" -# -# Unless specified otherwise, by default Redis will save the DB: -# * After 3600 seconds (an hour) if at least 1 change was performed -# * After 300 seconds (5 minutes) if at least 100 changes were performed -# * After 60 seconds if at least 10000 changes were performed -# -# You can set these explicitly by uncommenting the following line. -# -# save 3600 1 300 100 60 10000 +save 900 1 +save 300 10 +save 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -462,21 +338,6 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes -# Enables or disables full sanitization checks for ziplist and listpack etc when -# loading an RDB or RESTORE payload. This reduces the chances of a assertion or -# crash later on while processing commands. -# Options: -# no - Never perform full sanitization -# yes - Always perform full sanitization -# clients - Perform full sanitization only for user connections. -# Excludes: RDB files, RESTORE commands received from the master -# connection, and client connections which have the -# skip-sanitize-payload ACL flag. -# The default should be 'clients' but since it currently affects cluster -# resharding via MIGRATE, it is temporarily set to 'no' by default. -# -# sanitize-dump-payload no - # The filename where to dump the DB dbfilename dump.rdb @@ -551,10 +412,9 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error -# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" -# to all data access commands, excluding commands such as: -# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with +# an error "SYNC with master in progress" to all commands except: +# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -603,7 +463,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync yes +repl-diskless-sync no # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -617,18 +477,12 @@ repl-diskless-sync yes # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# When diskless replication is enabled with a delay, it is possible to let -# the replication start before the maximum delay is reached if the maximum -# number of replicas expected have connected. Default of 0 means that the -# maximum is not defined and Redis will wait the full delay. -repl-diskless-sync-max-replicas 0 - # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if you know what you are doing. +# stage with the master. Use only if your do what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -637,23 +491,19 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and replica buffers). +# Copy on Write memory and salve buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep current db contents in RAM while parsing the data directly -# from the socket. Replicas in this mode can keep serving current -# data set while replication is in progress, except for cases where -# they can't recognize master as having a data set from same -# replication history. -# Note that this requires sufficient memory, if you don't have it, -# you risk an OOM kill. +# "swapdb" - Keep a copy of the current db contents in RAM while parsing +# the data directly from the socket. note that this requires +# sufficient memory, if you don't have it, you risk an OOM kill. repl-diskless-load disabled -# Master send PINGs to its replicas in a predefined interval. It's possible to +# Replicas send PINGs to server in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -728,43 +578,6 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 -# The propagation error behavior controls how Redis will behave when it is -# unable to handle a command being processed in the replication stream from a master -# or processed while reading from an AOF file. Errors that occur during propagation -# are unexpected, and can cause data inconsistency. However, there are edge cases -# in earlier versions of Redis where it was possible for the server to replicate or persist -# commands that would fail on future versions. For this reason the default behavior -# is to ignore such errors and continue processing commands. -# -# If an application wants to ensure there is no data divergence, this configuration -# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' -# to only panic when a replica encounters an error on the replication stream. One of -# these two panic values will become the default value in the future once there are -# sufficient safety mechanisms in place to prevent false positive crashes. -# -# propagation-error-behavior ignore - -# Replica ignore disk write errors controls the behavior of a replica when it is -# unable to persist a write command received from its master to disk. By default, -# this configuration is set to 'no' and will crash the replica in this condition. -# It is not recommended to change this default, however in order to be compatible -# with older versions of Redis this config can be toggled to 'yes' which will just -# log a warning and execute the write command it got from the master. -# -# replica-ignore-disk-write-errors no - -# ----------------------------------------------------------------------------- -# By default, Redis Sentinel includes all replicas in its reports. A replica -# can be excluded from Redis Sentinel's announcements. An unannounced replica -# will be ignored by the 'sentinel replicas ' command and won't be -# exposed to Redis Sentinel's clients. -# -# This option does not change the behavior of replica-priority. Even with -# replica-announced set to 'no', the replica can be promoted to master. To -# prevent this behavior, set replica-priority to 0. -# -# replica-announced yes - # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -820,7 +633,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# a radix key indexed by key name, what clients have which keys. In turn +# 16 millions of slots, what clients may have certain subsets of keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -884,12 +697,8 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. -# sanitize-payload RESTORE dump-payload is sanitized (default). -# + Allow the execution of that command. -# May be used with `|` for allowing subcommands (e.g "+config|get") -# - Disallow the execution of that command. -# May be used with `|` for blocking subcommands (e.g "-config|set") +# + Allow the execution of that command +# - Disallow the execution of that command # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -897,11 +706,10 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|first-arg Allow a specific first argument of an otherwise -# disabled command. It is only supported on commands with -# no sub-commands, and is not allowed as negative form -# like -SELECT|1, only additive starting with "+". This -# feature is deprecated and may be removed in the future. +# +|subcommand Allow a specific subcommand of an otherwise +# disabled command. Note that this form is not +# allowed as negative like -DEBUG|SEGFAULT, but +# only additive starting with "+". # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -909,17 +717,8 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read -# from. -# %W~ Add key write pattern that specifies which keys can be -# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. -# & Add a glob-style pattern of Pub/Sub channels that can be -# accessed by the user. It is possible to specify multiple channel -# patterns. -# allchannels Alias for &* -# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -938,14 +737,6 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. -# () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last -# character must be ). -# clearselectors Remove all of the currently attached selectors. -# Note this does not change the "root" user permissions, -# which are the permissions directly applied onto the -# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -967,40 +758,6 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # -# The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata -# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, -# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, -# key or metadata will also have `write` category. Commands that only read -# the keyspace, key or metadata will have the `read` category. -# * read - Reading from keys (values or metadata). Note that commands that don't -# interact with keys, will not have either `read` or `write`. -# * write - Writing to keys (values or metadata) -# * admin - Administrative commands. Normal applications will never need to use -# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. -# * dangerous - Potentially dangerous (each should be considered with care for -# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, -# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. -# * connection - Commands affecting the connection or other connections. -# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. -# * blocking - Potentially blocking the connection until released by another -# command. -# * fast - Fast O(1) commands. May loop on the number of arguments, but not the -# number of elements in the key. -# * slow - All commands that are not Fast. -# * pubsub - PUBLISH / SUBSCRIBE related -# * transaction - WATCH / MULTI / EXEC related commands. -# * scripting - Scripting related. -# * set - Data type: sets related. -# * sortedset - Data type: zsets related. -# * list - Data type: lists related. -# * hash - Data type: hashes related. -# * string - Data type: strings related. -# * bitmap - Data type: bitmaps related. -# * hyperloglog - Data type: hyperloglog related. -# * geo - Data type: geo related. -# * stream - Data type: streams related. -# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -1030,24 +787,8 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# The requirepass is not compatible with aclfile option and the ACL LOAD -# command, these will cause requirepass to be ignored. -# # requirepass foobared -# New users are initialized with restrictive permissions by default, via the -# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it -# is possible to manage access to Pub/Sub channels with ACL rules as well. The -# default Pub/Sub channels permission if new users is controlled by the -# acl-pubsub-default configuration directive, which accepts one of these values: -# -# allchannels: grants access to all Pub/Sub channels -# resetchannels: revokes access to all Pub/Sub channels -# -# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. -# -# acl-pubsub-default resetchannels - # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -1136,12 +877,14 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, when there are no suitable keys for -# eviction, Redis will return an error on write operations that require -# more memory. These are usually commands that create new keys, add data or -# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, -# SORT (due to the STORE argument), and EXEC (if the transaction includes any -# command that requires memory). +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append +# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd +# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby +# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby +# getset mset msetnx exec sort # # The default is: # @@ -1158,14 +901,6 @@ acllog-max-len 128 # # maxmemory-samples 5 -# Eviction processing is designed to function well with the default setting. -# If there is an unusually large amount of write traffic, this value may need to -# be increased. Decreasing this value may reduce latency at the risk of -# eviction processing effectiveness -# 0 = minimum latency, 10 = default, 100 = process without regard to latency -# -# maxmemory-eviction-tenacity 10 - # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -1259,13 +994,6 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous -# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the -# commands. When neither flag is passed, this directive will be used to determine -# if the data should be deleted asynchronously. - -lazyfree-lazy-user-flush no - ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1304,7 +1032,7 @@ lazyfree-lazy-user-flush no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Also, this feature currently does not work when SSL is +# CONFIG SET. Aso this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1322,7 +1050,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports these options: +# Redis supports three options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1343,19 +1071,6 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 - -#################### KERNEL transparent hugepage CONTROL ###################### - -# Usually the kernel Transparent Huge Pages control is set to "madvise" or -# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which -# case this config has no effect. On systems in which it is set to "always", -# redis will attempt to disable it specifically for the redis process in order -# to avoid latency problems specifically with fork(2) and CoW. -# If for some reason you prefer to keep it enabled, you can set this config to -# "no" and the kernel global to "always". - -disable-thp yes - ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1374,43 +1089,14 @@ disable-thp yes # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check https://redis.io/topics/persistence for more information. +# Please check http://redis.io/topics/persistence for more information. appendonly no -# The base name of the append only file. -# -# Redis 7 and newer use a set of append-only files to persist the dataset -# and changes applied to it. There are two basic types of files in use: -# -# - Base files, which are a snapshot representing the complete state of the -# dataset at the time the file was created. Base files can be either in -# the form of RDB (binary serialized) or AOF (textual commands). -# - Incremental files, which contain additional commands that were applied -# to the dataset following the previous file. -# -# In addition, manifest files are used to track the files and the order in -# which they were created and should be applied. -# -# Append-only file names are created by Redis following a specific pattern. -# The file name's prefix is based on the 'appendfilename' configuration -# parameter, followed by additional information about the sequence and type. -# -# For example, if appendfilename is set to appendonly.aof, the following file -# names could be derived: -# -# - appendonly.aof.1.base.rdb as a base file. -# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. -# - appendonly.aof.manifest as a manifest file. +# The name of the append only file (default: "appendonly.aof") appendfilename "appendonly.aof" -# For convenience, Redis stores all persistent append-only files in a dedicated -# directory. The name of the directory is determined by the appenddirname -# configuration parameter. - -appenddirname "appendonlydir" - # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1450,7 +1136,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync no". In practical terms, this means that it is +# the same as "appendfsync none". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1503,69 +1189,34 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# Redis can create append-only base files in either RDB or AOF formats. Using -# the RDB format is always faster and more efficient, and disabling it is only -# supported for backward compatibility purposes. +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading, Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, then continues loading the AOF +# tail. aof-use-rdb-preamble yes -# Redis supports recording timestamp annotations in the AOF to support restoring -# the data from a specific point-in-time. However, using this capability changes -# the AOF format in a way that may not be compatible with existing AOF parsers. -aof-timestamp-enabled no +################################ LUA SCRIPTING ############################### -################################ SHUTDOWN ##################################### - -# Maximum time to wait for replicas when shutting down, in seconds. +# Max execution time of a Lua script in milliseconds. # -# During shut down, a grace period allows any lagging replicas to catch up with -# the latest replication offset before the master exists. This period can -# prevent data loss, especially for deployments without configured disk backups. +# If the maximum execution time is reached Redis will log that a script is +# still in execution after the maximum allowed time and will start to +# reply to queries with an error. # -# The 'shutdown-timeout' value is the grace period's duration in seconds. It is -# only applicable when the instance has replicas. To disable the feature, set -# the value to 0. +# When a long running script exceeds the maximum execution time only the +# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be +# used to stop a script that did not yet call any write commands. The second +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural +# termination of the script. # -# shutdown-timeout 10 - -# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default -# an RDB snapshot is written to disk in a blocking operation if save points are configured. -# The options used on signaled shutdown can include the following values: -# default: Saves RDB snapshot only if save points are configured. -# Waits for lagging replicas to catch up. -# save: Forces a DB saving operation even if no save points are configured. -# nosave: Prevents DB saving operation even if one or more save points are configured. -# now: Skips waiting for lagging replicas. -# force: Ignores any errors that would normally prevent the server from exiting. -# -# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. -# Example: "nosave force now" -# -# shutdown-on-sigint default -# shutdown-on-sigterm default - -################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### - -# Maximum time in milliseconds for EVAL scripts, functions and in some cases -# modules' commands before Redis can start processing or rejecting other clients. -# -# If the maximum execution time is reached Redis will start to reply to most -# commands with a BUSY error. -# -# In this state Redis will only allow a handful of commands to be executed. -# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. -# -# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not -# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop -# the server in the case a write command was already issued by the script when -# the user doesn't want to wait for the natural termination of the script. -# -# The default is 5 seconds. It is possible to set it to 0 or a negative value -# to disable this mechanism (uninterrupted execution). Note that in the past -# this config had a different name, which is now an alias, so both of these do -# the same: -# lua-time-limit 5000 -# busy-reply-threshold 5000 +# Set it to 0 or a negative value for unlimited execution without warnings. +lua-time-limit 5000 ################################ REDIS CLUSTER ############################### @@ -1589,11 +1240,6 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires -# you to specify the cluster bus port when executing cluster meet. -# cluster-port 0 - # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1652,21 +1298,12 @@ aof-timestamp-enabled no # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value or -# set cluster-allow-replica-migration to 'no'. +# one replica). To disable migration just set it to a very large value. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 -# Turning off this option allows to use less automatic cluster configuration. -# It both disables migration to orphaned masters and migration from masters -# that became empty. -# -# Default is 'yes' (allow automatic migrations). -# -# cluster-allow-replica-migration yes - # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1681,7 +1318,7 @@ aof-timestamp-enabled no # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the replica can still perform a +# master during master failures. However the master can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1691,7 +1328,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1706,54 +1343,8 @@ aof-timestamp-enabled no # # cluster-allow-reads-when-down no -# This option, when set to yes, allows nodes to serve pubsub shard traffic while -# the cluster is in a down state, as long as it believes it owns the slots. -# -# This is useful if the application would like to use the pubsub feature even when -# the cluster global stable state is not OK. If the application wants to make sure only -# one shard is serving a given channel, this feature should be kept as yes. -# -# cluster-allow-pubsubshard-when-down yes - -# Cluster link send buffer limit is the limit on the memory usage of an individual -# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed -# this limit. This is to primarily prevent send buffers from growing unbounded on links -# toward slow peers (E.g. PubSub messages being piled up). -# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field -# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. -# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single -# PubSub message by default. (client-query-buffer-limit default value is 1gb) -# -# cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for -# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based -# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propagate the removal. -# -# cluster-announce-hostname "" - -# Clusters can advertise how clients should connect to them using either their IP address, -# a user defined hostname, or by declaring they have no endpoint. Which endpoint is -# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type -# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' -# will be returned instead. -# -# When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the -# server doesn't know which one the client took. In this case, the server is expecting -# the client to reach out on the same endpoint it used for making the last request, but use -# the port provided in the response. -# -# cluster-preferred-endpoint-type ip - # In order to setup your cluster make sure to read the documentation -# available at https://redis.io web site. +# available at http://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1763,21 +1354,16 @@ aof-timestamp-enabled no # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following four options are used for this scope, and are: +# following two options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port -# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client ports (for connections -# without and with TLS) and cluster message bus port. The information is then -# published in the header of the bus packets so that other nodes will be able to -# correctly map the address of the node publishing the information. -# -# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set -# to zero, then cluster-announce-port refers to the TLS port. Note also that -# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# Each instructs the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1790,8 +1376,7 @@ aof-timestamp-enabled no # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-tls-port 6379 -# cluster-announce-port 0 +# cluster-announce-port 6379 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1839,24 +1424,10 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 -################################ LATENCY TRACKING ############################## - -# The Redis extended latency monitoring tracks the per command latencies and enables -# exporting the percentile distribution via the INFO latencystats command, -# and cumulative latency distributions (histograms) via the LATENCY command. -# -# By default, the extended latency monitoring is enabled since the overhead -# of keeping track of the command latency is very small. -# latency-tracking yes - -# By default the exported latency percentiles via the INFO latencystats command -# are the p50, p99, and p999. -# latency-tracking-info-percentiles 50 99 99.9 - ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at https://redis.io/topics/notifications +# This feature is documented at http://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1878,11 +1449,9 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) -# n New key events (Note: not included in the 'A' class) # t Stream commands -# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# A Alias for g$lshzxet, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1905,13 +1474,71 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" +############################### GOPHER SERVER ################################# + +# Redis contains an implementation of the Gopher protocol, as specified in +# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). +# +# The Gopher protocol was very popular in the late '90s. It is an alternative +# to the web, and the implementation both server and client side is so simple +# that the Redis server has just 100 lines of code in order to implement this +# support. +# +# What do you do with Gopher nowadays? Well Gopher never *really* died, and +# lately there is a movement in order for the Gopher more hierarchical content +# composed of just plain text documents to be resurrected. Some want a simpler +# internet, others believe that the mainstream internet became too much +# controlled, and it's cool to create an alternative space for people that +# want a bit of fresh air. +# +# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol +# as a gift. +# +# --- HOW IT WORKS? --- +# +# The Redis Gopher support uses the inline protocol of Redis, and specifically +# two kind of inline requests that were anyway illegal: an empty request +# or any request that starts with "/" (there are no Redis commands starting +# with such a slash). Normal RESP2/RESP3 requests are completely out of the +# path of the Gopher protocol implementation and are served as usual as well. +# +# If you open a connection to Redis when Gopher is enabled and send it +# a string like "/foo", if there is a key named "/foo" it is served via the +# Gopher protocol. +# +# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher +# talking), you likely need a script like the following: +# +# https://github.com/antirez/gopher2redis +# +# --- SECURITY WARNING --- +# +# If you plan to put Redis on the internet in a publicly accessible address +# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. +# Once a password is set: +# +# 1. The Gopher server (when enabled, not by default) will still serve +# content via Gopher. +# 2. However other commands cannot be called before the client will +# authenticate. +# +# So use the 'requirepass' option to protect your instance. +# +# Note that Gopher is not currently supported when 'io-threads-do-reads' +# is enabled. +# +# To enable Gopher support, uncomment the following line and set the option +# from no (the default) to yes. +# +# gopher-enabled no + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-listpack-entries 512 -hash-max-listpack-value 64 +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1926,7 +1553,7 @@ hash-max-listpack-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-listpack-size -2 +list-max-ziplist-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1954,8 +1581,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-listpack-entries 128 -zset-max-listpack-value 64 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1977,7 +1604,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entries limit by setting max-bytes to 0 and max-entries to the desired +# max entires limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -2010,7 +1637,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2034,13 +1661,6 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # -# Note that it doesn't make sense to set the replica clients output buffer -# limit lower than the repl-backlog-size config (partial sync will succeed -# and then replica will get disconnected). -# Such a configuration is ignored (the size of repl-backlog-size will be used). -# This doesn't have memory consumption implications since the replica client -# will share the backlog buffers memory. -# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -2054,25 +1674,6 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb -# In some scenarios client connections can hog up memory leading to OOM -# errors or data eviction. To avoid this we can cap the accumulated memory -# used by all client connections (all pubsub and normal clients). Once we -# reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most -# memory first. We call this mechanism "client eviction". -# -# Client eviction is configured using the maxmemory-clients setting as follows: -# 0 - client eviction is disabled (default) -# -# A memory value can be used for the client eviction threshold, -# for example: -# maxmemory-clients 1g -# -# A percentage value (between 1% and 100%) means the client eviction threshold -# is based on a percentage of the maxmemory setting. For example to set client -# eviction at 5% of maxmemory: -# maxmemory-clients 5% - # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -2113,13 +1714,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -2216,7 +1817,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Active defragmentation is disabled by default +# Enabled active defragmentation # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis_7_4_6/docker-compose.yml b/dockge/redis_6_2_20/docker-compose.yml similarity index 94% rename from dockge/redis_7_4_6/docker-compose.yml rename to dockge/redis_6_2_20/docker-compose.yml index fe930bde8..414c1b027 100644 --- a/dockge/redis_7_4_6/docker-compose.yml +++ b/dockge/redis_6_2_20/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:7.4.6-alpine + image: redis:6.2.20-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_7_4_6/envs/default.env b/dockge/redis_6_2_20/envs/default.env similarity index 100% rename from dockge/redis_7_4_6/envs/default.env rename to dockge/redis_6_2_20/envs/default.env diff --git a/dockge/redis_7_4_6/envs/global.env b/dockge/redis_6_2_20/envs/global.env similarity index 100% rename from dockge/redis_7_4_6/envs/global.env rename to dockge/redis_6_2_20/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/.env b/dockge/stream-rec-backend_main/.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/.env rename to dockge/stream-rec-backend_main/.env diff --git a/dockge/stream-rec-backend_0_7_2/docker-compose.yml b/dockge/stream-rec-backend_main/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_0_7_2/docker-compose.yml rename to dockge/stream-rec-backend_main/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-backend_main/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/envs/default.env b/dockge/stream-rec-backend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/default.env rename to dockge/stream-rec-backend_main/envs/default.env diff --git a/dockge/stream-rec-backend_0_7_2/envs/global.env b/dockge/stream-rec-backend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/global.env rename to dockge/stream-rec-backend_main/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/.env b/dockge/stream-rec-frontend_main/.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/.env rename to dockge/stream-rec-frontend_main/.env diff --git a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml b/dockge/stream-rec-frontend_main/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_0_7_2/docker-compose.yml rename to dockge/stream-rec-frontend_main/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-frontend_main/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/envs/default.env b/dockge/stream-rec-frontend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/default.env rename to dockge/stream-rec-frontend_main/envs/default.env diff --git a/dockge/stream-rec-frontend_0_7_2/envs/global.env b/dockge/stream-rec-frontend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/global.env rename to dockge/stream-rec-frontend_main/envs/global.env diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 8465b7136..03a278089 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:dev + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:dev + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_0_7_2/.env b/dockge/stream-rec_dev/.env similarity index 100% rename from dockge/stream-rec_0_7_2/.env rename to dockge/stream-rec_dev/.env diff --git a/dockge/stream-rec_0_7_2/docker-compose.yml b/dockge/stream-rec_dev/docker-compose.yml similarity index 92% rename from dockge/stream-rec_0_7_2/docker-compose.yml rename to dockge/stream-rec_dev/docker-compose.yml index 03a278089..8465b7136 100644 --- a/dockge/stream-rec_0_7_2/docker-compose.yml +++ b/dockge/stream-rec_dev/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_0_7_2/envs/default.env b/dockge/stream-rec_dev/envs/default.env similarity index 100% rename from dockge/stream-rec_0_7_2/envs/default.env rename to dockge/stream-rec_dev/envs/default.env diff --git a/dockge/stream-rec_0_7_2/envs/global.env b/dockge/stream-rec_dev/envs/global.env similarity index 100% rename from dockge/stream-rec_0_7_2/envs/global.env rename to dockge/stream-rec_dev/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 5fa74c158..32a291fcd 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,9 +4,3 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env new file mode 100644 index 000000000..5fa74c158 --- /dev/null +++ b/dockge/uptime-kuma_1_23_16/.env @@ -0,0 +1,12 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= + +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false + diff --git a/dockge/uptime-kuma_2_0_0/docker-compose.yml b/dockge/uptime-kuma_1_23_16/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_2_0_0/docker-compose.yml rename to dockge/uptime-kuma_1_23_16/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma_2_0_0/docker-compose.yml +++ b/dockge/uptime-kuma_1_23_16/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_2_0_0/envs/default.env b/dockge/uptime-kuma_1_23_16/envs/default.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/default.env rename to dockge/uptime-kuma_1_23_16/envs/default.env diff --git a/dockge/uptime-kuma_2_0_0/envs/global.env b/dockge/uptime-kuma_1_23_16/envs/global.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/global.env rename to dockge/uptime-kuma_1_23_16/envs/global.env diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env deleted file mode 100644 index 32a291fcd..000000000 --- a/dockge/uptime-kuma_2_0_0/.env +++ /dev/null @@ -1,6 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - From 16c654ffa307bf5b6cb8ca391212684731a62c9b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 18:32:46 +0000 Subject: [PATCH 190/262] Update ghcr.io/open-webui/open-webui Docker tag to v0.6.34 --- apps/open-webui/0.6.33/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/open-webui/0.6.33/docker-compose.yml b/apps/open-webui/0.6.33/docker-compose.yml index c6db58520..8e968952e 100644 --- a/apps/open-webui/0.6.33/docker-compose.yml +++ b/apps/open-webui/0.6.33/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: open-webui: - image: ghcr.io/open-webui/open-webui:0.6.33 + image: ghcr.io/open-webui/open-webui:0.6.34 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From d294265322fb5c3bcfec73628d4df5080446b129 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 18:32:51 +0000 Subject: [PATCH 191/262] Update mlikiowa/napcat-docker Docker tag to v4.8.122 --- apps/astrbot-napcat/4.8.121/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/astrbot-napcat/4.8.121/docker-compose.yml b/apps/astrbot-napcat/4.8.121/docker-compose.yml index 7538e9ba1..6a98bdc2d 100644 --- a/apps/astrbot-napcat/4.8.121/docker-compose.yml +++ b/apps/astrbot-napcat/4.8.121/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: napcat: - image: mlikiowa/napcat-docker:v4.8.121 + image: mlikiowa/napcat-docker:v4.8.122 container_name: napcat-${CONTAINER_NAME} restart: always networks: From 532a3a5cbbc9daf7447d7cc56de0f7b6e29af7c3 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 16 Oct 2025 18:32:56 +0000 Subject: [PATCH 192/262] Update app version [skip ci] --- apps/open-webui/{0.6.33 => 0.6.34}/data.yml | 0 apps/open-webui/{0.6.33 => 0.6.34}/docker-compose.yml | 0 apps/open-webui/{0.6.33 => 0.6.34}/envs/default.env | 0 apps/open-webui/{0.6.33 => 0.6.34}/envs/global.env | 0 apps/open-webui/{0.6.33 => 0.6.34}/scripts/init.sh | 0 apps/open-webui/{0.6.33 => 0.6.34}/scripts/uninstall.sh | 0 apps/open-webui/{0.6.33 => 0.6.34}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/open-webui/{0.6.33 => 0.6.34}/data.yml (100%) rename apps/open-webui/{0.6.33 => 0.6.34}/docker-compose.yml (100%) rename apps/open-webui/{0.6.33 => 0.6.34}/envs/default.env (100%) rename apps/open-webui/{0.6.33 => 0.6.34}/envs/global.env (100%) rename apps/open-webui/{0.6.33 => 0.6.34}/scripts/init.sh (100%) rename apps/open-webui/{0.6.33 => 0.6.34}/scripts/uninstall.sh (100%) rename apps/open-webui/{0.6.33 => 0.6.34}/scripts/upgrade.sh (100%) diff --git a/apps/open-webui/0.6.33/data.yml b/apps/open-webui/0.6.34/data.yml similarity index 100% rename from apps/open-webui/0.6.33/data.yml rename to apps/open-webui/0.6.34/data.yml diff --git a/apps/open-webui/0.6.33/docker-compose.yml b/apps/open-webui/0.6.34/docker-compose.yml similarity index 100% rename from apps/open-webui/0.6.33/docker-compose.yml rename to apps/open-webui/0.6.34/docker-compose.yml diff --git a/apps/open-webui/0.6.33/envs/default.env b/apps/open-webui/0.6.34/envs/default.env similarity index 100% rename from apps/open-webui/0.6.33/envs/default.env rename to apps/open-webui/0.6.34/envs/default.env diff --git a/apps/open-webui/0.6.33/envs/global.env b/apps/open-webui/0.6.34/envs/global.env similarity index 100% rename from apps/open-webui/0.6.33/envs/global.env rename to apps/open-webui/0.6.34/envs/global.env diff --git a/apps/open-webui/0.6.33/scripts/init.sh b/apps/open-webui/0.6.34/scripts/init.sh similarity index 100% rename from apps/open-webui/0.6.33/scripts/init.sh rename to apps/open-webui/0.6.34/scripts/init.sh diff --git a/apps/open-webui/0.6.33/scripts/uninstall.sh b/apps/open-webui/0.6.34/scripts/uninstall.sh similarity index 100% rename from apps/open-webui/0.6.33/scripts/uninstall.sh rename to apps/open-webui/0.6.34/scripts/uninstall.sh diff --git a/apps/open-webui/0.6.33/scripts/upgrade.sh b/apps/open-webui/0.6.34/scripts/upgrade.sh similarity index 100% rename from apps/open-webui/0.6.33/scripts/upgrade.sh rename to apps/open-webui/0.6.34/scripts/upgrade.sh From 1809d60b6c1b023b83a7afd0fa8b058fd17c7bc6 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 16 Oct 2025 18:33:01 +0000 Subject: [PATCH 193/262] Update app version [skip ci] --- apps/astrbot-napcat/{4.8.121 => 4.8.122}/data.yml | 0 apps/astrbot-napcat/{4.8.121 => 4.8.122}/docker-compose.yml | 0 apps/astrbot-napcat/{4.8.121 => 4.8.122}/envs/default.env | 0 apps/astrbot-napcat/{4.8.121 => 4.8.122}/envs/global.env | 0 apps/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/init.sh | 0 apps/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/uninstall.sh | 0 apps/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/data.yml (100%) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/docker-compose.yml (100%) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/envs/default.env (100%) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/envs/global.env (100%) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/init.sh (100%) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/uninstall.sh (100%) rename apps/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/upgrade.sh (100%) diff --git a/apps/astrbot-napcat/4.8.121/data.yml b/apps/astrbot-napcat/4.8.122/data.yml similarity index 100% rename from apps/astrbot-napcat/4.8.121/data.yml rename to apps/astrbot-napcat/4.8.122/data.yml diff --git a/apps/astrbot-napcat/4.8.121/docker-compose.yml b/apps/astrbot-napcat/4.8.122/docker-compose.yml similarity index 100% rename from apps/astrbot-napcat/4.8.121/docker-compose.yml rename to apps/astrbot-napcat/4.8.122/docker-compose.yml diff --git a/apps/astrbot-napcat/4.8.121/envs/default.env b/apps/astrbot-napcat/4.8.122/envs/default.env similarity index 100% rename from apps/astrbot-napcat/4.8.121/envs/default.env rename to apps/astrbot-napcat/4.8.122/envs/default.env diff --git a/apps/astrbot-napcat/4.8.121/envs/global.env b/apps/astrbot-napcat/4.8.122/envs/global.env similarity index 100% rename from apps/astrbot-napcat/4.8.121/envs/global.env rename to apps/astrbot-napcat/4.8.122/envs/global.env diff --git a/apps/astrbot-napcat/4.8.121/scripts/init.sh b/apps/astrbot-napcat/4.8.122/scripts/init.sh similarity index 100% rename from apps/astrbot-napcat/4.8.121/scripts/init.sh rename to apps/astrbot-napcat/4.8.122/scripts/init.sh diff --git a/apps/astrbot-napcat/4.8.121/scripts/uninstall.sh b/apps/astrbot-napcat/4.8.122/scripts/uninstall.sh similarity index 100% rename from apps/astrbot-napcat/4.8.121/scripts/uninstall.sh rename to apps/astrbot-napcat/4.8.122/scripts/uninstall.sh diff --git a/apps/astrbot-napcat/4.8.121/scripts/upgrade.sh b/apps/astrbot-napcat/4.8.122/scripts/upgrade.sh similarity index 100% rename from apps/astrbot-napcat/4.8.121/scripts/upgrade.sh rename to apps/astrbot-napcat/4.8.122/scripts/upgrade.sh From 1b10120271aae55b07552f3a57c9cc7b5457e296 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 16 Oct 2025 21:17:58 +0000 Subject: [PATCH 194/262] Processed apps directory via GitHub Actions --- .../astrbot-napcat/{4.8.121 => 4.8.122}/.env | 0 .../{4.8.121 => 4.8.122}/data.yml | 0 .../{4.8.121 => 4.8.122}/docker-compose.yml | 2 +- .../{4.8.121 => 4.8.122}/envs/default.env | 0 .../{4.8.121 => 4.8.122}/envs/global.env | 0 .../{4.8.121 => 4.8.122}/scripts/init.sh | 0 .../{4.8.121 => 4.8.122}/scripts/uninstall.sh | 0 .../{4.8.121 => 4.8.122}/scripts/upgrade.sh | 0 appstore/open-webui/{0.6.33 => 0.6.34}/.env | 0 .../open-webui/{0.6.33 => 0.6.34}/data.yml | 0 .../{0.6.33 => 0.6.34}/docker-compose.yml | 2 +- .../{0.6.33 => 0.6.34}/envs/default.env | 0 .../{0.6.33 => 0.6.34}/envs/global.env | 0 .../{0.6.33 => 0.6.34}/scripts/init.sh | 0 .../{0.6.33 => 0.6.34}/scripts/uninstall.sh | 0 .../{0.6.33 => 0.6.34}/scripts/upgrade.sh | 0 dockge/affine/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-aria2/.env | 2 +- dockge/alist-aria2/docker-compose.yml | 6 +- .../.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-ffmpeg/.env | 2 +- dockge/alist-ffmpeg/docker-compose.yml | 6 +- .../{alist_4_0_2 => alist-ffmpeg_3_45_0}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist/.env | 2 +- dockge/alist/docker-compose.yml | 6 +- .../{alist-aria2_4_0_2 => alist_3_45_0}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/archivebox/docker-compose.yml | 24 +- .../.env | 0 .../docker-compose.yml | 24 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- dockge/baota/docker-compose.yml | 2 +- dockge/{baota_10_0 => baota_9_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../{baota_10_0 => baota_9_0}/envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/emby/docker-compose.yml | 2 +- dockge/{emby_4_8_11_0 => emby_4_9_2_4}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/homarr/.env | 2 +- dockge/homarr/docker-compose.yml | 2 +- dockge/{homarr_0_16_0 => homarr_1_41_0}/.env | 2 +- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/iyuu-plus/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/minio/.env | 5 +- dockge/minio/docker-compose.yml | 6 +- .../.env | 5 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/moontv/.env | 3 + dockge/moontv/docker-compose.yml | 2 +- dockge/{moontv_4_3_0 => moontv_latest}/.env | 3 - .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql/config/my.cnf | 34 +- dockge/mysql/docker-compose.yml | 11 +- dockge/{mysql_8_4_6 => mysql_5_7_44}/.env | 0 dockge/mysql_5_7_44/config/my.cnf | 42 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql_8_4_6/config/my.cnf | 20 - dockge/nacos/docker-compose.yml | 2 +- dockge/{nacos_2_5_1 => nacos_2_4_3}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 0 dockge/open-webui/docker-compose.yml | 2 +- dockge/postgresql-postgis/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/qbittorrent/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/redis/config/redis.conf | 759 +++++------------- dockge/redis/docker-compose.yml | 2 +- dockge/{redis_6_2_20 => redis_7_4_6}/.env | 0 .../config/redis.conf | 759 +++++++++++++----- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-backend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-frontend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec/docker-compose.yml | 4 +- .../{stream-rec_dev => stream-rec_0_7_2}/.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma/.env | 6 + dockge/uptime-kuma/docker-compose.yml | 11 +- dockge/uptime-kuma_1_23_16/.env | 12 - dockge/uptime-kuma_2_0_0/.env | 6 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 158 files changed, 949 insertions(+), 949 deletions(-) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/.env (100%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/data.yml (100%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/docker-compose.yml (96%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/envs/default.env (100%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/envs/global.env (100%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/init.sh (100%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/uninstall.sh (100%) rename appstore/astrbot-napcat/{4.8.121 => 4.8.122}/scripts/upgrade.sh (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/.env (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/data.yml (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/docker-compose.yml (91%) rename appstore/open-webui/{0.6.33 => 0.6.34}/envs/default.env (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/envs/global.env (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/scripts/init.sh (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/scripts/uninstall.sh (100%) rename appstore/open-webui/{0.6.33 => 0.6.34}/scripts/upgrade.sh (100%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/.env (100%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/docker-compose.yml (94%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/envs/default.env (100%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/envs/global.env (100%) rename dockge/{alist-ffmpeg_4_0_2 => alist-aria2_3_40_0}/.env (93%) rename dockge/{alist-aria2_4_0_2 => alist-aria2_3_40_0}/docker-compose.yml (85%) rename dockge/{alist-aria2_4_0_2 => alist-aria2_3_40_0}/envs/default.env (100%) rename dockge/{alist-aria2_4_0_2 => alist-aria2_3_40_0}/envs/global.env (100%) rename dockge/{alist_4_0_2 => alist-ffmpeg_3_45_0}/.env (93%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/docker-compose.yml (85%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/envs/default.env (100%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/envs/global.env (100%) rename dockge/{alist-aria2_4_0_2 => alist_3_45_0}/.env (93%) rename dockge/{alist_4_0_2 => alist_3_45_0}/docker-compose.yml (86%) rename dockge/{alist_4_0_2 => alist_3_45_0}/envs/default.env (100%) rename dockge/{alist_4_0_2 => alist_3_45_0}/envs/global.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/docker-compose.yml (60%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/envs/default.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/envs/global.env (100%) rename dockge/{baota_10_0 => baota_9_0}/.env (100%) rename dockge/{baota_10_0 => baota_9_0}/docker-compose.yml (92%) rename dockge/{baota_10_0 => baota_9_0}/envs/default.env (100%) rename dockge/{baota_10_0 => baota_9_0}/envs/global.env (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/.env (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/categories.json (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/config.yaml (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/template.html (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/docker-compose.yml (88%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/envs/default.env (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/.env (100%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/envs/global.env (100%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/.env (100%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/docker-compose.yml (95%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/envs/default.env (100%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/envs/global.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/docker-compose.yml (96%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/envs/default.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/envs/global.env (100%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/.env (67%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/docker-compose.yml (89%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/default.env (100%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/global.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/docker-compose.yml (95%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/envs/default.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/envs/global.env (100%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/.env (86%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/docker-compose.yml (83%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/envs/default.env (100%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/envs/global.env (100%) rename dockge/{moontv_4_3_0 => moontv_latest}/.env (95%) rename dockge/{moontv_4_3_0 => moontv_latest}/docker-compose.yml (87%) rename dockge/{moontv_4_3_0 => moontv_latest}/envs/default.env (100%) rename dockge/{moontv_4_3_0 => moontv_latest}/envs/global.env (100%) rename dockge/{mysql_8_4_6 => mysql_5_7_44}/.env (100%) create mode 100644 dockge/mysql_5_7_44/config/my.cnf rename dockge/{mysql_8_4_6 => mysql_5_7_44}/docker-compose.yml (65%) rename dockge/{mysql_8_4_6 => mysql_5_7_44}/envs/default.env (100%) rename dockge/{mysql_8_4_6 => mysql_5_7_44}/envs/global.env (100%) delete mode 100644 dockge/mysql_8_4_6/config/my.cnf rename dockge/{nacos_2_5_1 => nacos_2_4_3}/.env (100%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/docker-compose.yml (94%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/envs/default.env (100%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/envs/global.env (100%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/init/mysql-schema.sql (100%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/.env (100%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/docker-compose.yml (94%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/envs/default.env (100%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/envs/global.env (100%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/.env (100%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/docker-compose.yml (89%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/envs/default.env (100%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/envs/global.env (100%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/.env (100%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/docker-compose.yml (95%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/envs/default.env (100%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/envs/global.env (100%) rename dockge/{redis_6_2_20 => redis_7_4_6}/.env (100%) rename dockge/{redis_6_2_20 => redis_7_4_6}/config/redis.conf (72%) rename dockge/{redis_6_2_20 => redis_7_4_6}/docker-compose.yml (94%) rename dockge/{redis_6_2_20 => redis_7_4_6}/envs/default.env (100%) rename dockge/{redis_6_2_20 => redis_7_4_6}/envs/global.env (100%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/.env (100%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/docker-compose.yml (92%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/envs/global.env (100%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/.env (100%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/docker-compose.yml (87%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/envs/global.env (100%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/.env (100%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/docker-compose.yml (92%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/envs/global.env (100%) delete mode 100644 dockge/uptime-kuma_1_23_16/.env create mode 100644 dockge/uptime-kuma_2_0_0/.env rename dockge/{uptime-kuma_1_23_16 => uptime-kuma_2_0_0}/docker-compose.yml (57%) rename dockge/{uptime-kuma_1_23_16 => uptime-kuma_2_0_0}/envs/default.env (100%) rename dockge/{uptime-kuma_1_23_16 => uptime-kuma_2_0_0}/envs/global.env (100%) diff --git a/appstore/astrbot-napcat/4.8.121/.env b/appstore/astrbot-napcat/4.8.122/.env similarity index 100% rename from appstore/astrbot-napcat/4.8.121/.env rename to appstore/astrbot-napcat/4.8.122/.env diff --git a/appstore/astrbot-napcat/4.8.121/data.yml b/appstore/astrbot-napcat/4.8.122/data.yml similarity index 100% rename from appstore/astrbot-napcat/4.8.121/data.yml rename to appstore/astrbot-napcat/4.8.122/data.yml diff --git a/appstore/astrbot-napcat/4.8.121/docker-compose.yml b/appstore/astrbot-napcat/4.8.122/docker-compose.yml similarity index 96% rename from appstore/astrbot-napcat/4.8.121/docker-compose.yml rename to appstore/astrbot-napcat/4.8.122/docker-compose.yml index c022ffc91..7afe99e91 100644 --- a/appstore/astrbot-napcat/4.8.121/docker-compose.yml +++ b/appstore/astrbot-napcat/4.8.122/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.121 + image: mlikiowa/napcat-docker:v4.8.122 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/appstore/astrbot-napcat/4.8.121/envs/default.env b/appstore/astrbot-napcat/4.8.122/envs/default.env similarity index 100% rename from appstore/astrbot-napcat/4.8.121/envs/default.env rename to appstore/astrbot-napcat/4.8.122/envs/default.env diff --git a/appstore/astrbot-napcat/4.8.121/envs/global.env b/appstore/astrbot-napcat/4.8.122/envs/global.env similarity index 100% rename from appstore/astrbot-napcat/4.8.121/envs/global.env rename to appstore/astrbot-napcat/4.8.122/envs/global.env diff --git a/appstore/astrbot-napcat/4.8.121/scripts/init.sh b/appstore/astrbot-napcat/4.8.122/scripts/init.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.121/scripts/init.sh rename to appstore/astrbot-napcat/4.8.122/scripts/init.sh diff --git a/appstore/astrbot-napcat/4.8.121/scripts/uninstall.sh b/appstore/astrbot-napcat/4.8.122/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.121/scripts/uninstall.sh rename to appstore/astrbot-napcat/4.8.122/scripts/uninstall.sh diff --git a/appstore/astrbot-napcat/4.8.121/scripts/upgrade.sh b/appstore/astrbot-napcat/4.8.122/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot-napcat/4.8.121/scripts/upgrade.sh rename to appstore/astrbot-napcat/4.8.122/scripts/upgrade.sh diff --git a/appstore/open-webui/0.6.33/.env b/appstore/open-webui/0.6.34/.env similarity index 100% rename from appstore/open-webui/0.6.33/.env rename to appstore/open-webui/0.6.34/.env diff --git a/appstore/open-webui/0.6.33/data.yml b/appstore/open-webui/0.6.34/data.yml similarity index 100% rename from appstore/open-webui/0.6.33/data.yml rename to appstore/open-webui/0.6.34/data.yml diff --git a/appstore/open-webui/0.6.33/docker-compose.yml b/appstore/open-webui/0.6.34/docker-compose.yml similarity index 91% rename from appstore/open-webui/0.6.33/docker-compose.yml rename to appstore/open-webui/0.6.34/docker-compose.yml index a17822f98..a12b5476b 100644 --- a/appstore/open-webui/0.6.33/docker-compose.yml +++ b/appstore/open-webui/0.6.34/docker-compose.yml @@ -15,7 +15,7 @@ services: - ENABLE_OLLAMA_API=True - ENABLE_OPENAI_API=False - https_proxy=${http_proxy} - image: ghcr.io/open-webui/open-webui:0.6.33 + image: ghcr.io/open-webui/open-webui:0.6.34 labels: createdBy: Apps networks: diff --git a/appstore/open-webui/0.6.33/envs/default.env b/appstore/open-webui/0.6.34/envs/default.env similarity index 100% rename from appstore/open-webui/0.6.33/envs/default.env rename to appstore/open-webui/0.6.34/envs/default.env diff --git a/appstore/open-webui/0.6.33/envs/global.env b/appstore/open-webui/0.6.34/envs/global.env similarity index 100% rename from appstore/open-webui/0.6.33/envs/global.env rename to appstore/open-webui/0.6.34/envs/global.env diff --git a/appstore/open-webui/0.6.33/scripts/init.sh b/appstore/open-webui/0.6.34/scripts/init.sh similarity index 100% rename from appstore/open-webui/0.6.33/scripts/init.sh rename to appstore/open-webui/0.6.34/scripts/init.sh diff --git a/appstore/open-webui/0.6.33/scripts/uninstall.sh b/appstore/open-webui/0.6.34/scripts/uninstall.sh similarity index 100% rename from appstore/open-webui/0.6.33/scripts/uninstall.sh rename to appstore/open-webui/0.6.34/scripts/uninstall.sh diff --git a/appstore/open-webui/0.6.33/scripts/upgrade.sh b/appstore/open-webui/0.6.34/scripts/upgrade.sh similarity index 100% rename from appstore/open-webui/0.6.33/scripts/upgrade.sh rename to appstore/open-webui/0.6.34/scripts/upgrade.sh diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 94a383ee2..18926413f 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-1623f5d/.env b/dockge/affine_stable-e98f035/.env similarity index 100% rename from dockge/affine_stable-1623f5d/.env rename to dockge/affine_stable-e98f035/.env diff --git a/dockge/affine_stable-1623f5d/docker-compose.yml b/dockge/affine_stable-e98f035/docker-compose.yml similarity index 94% rename from dockge/affine_stable-1623f5d/docker-compose.yml rename to dockge/affine_stable-e98f035/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine_stable-1623f5d/docker-compose.yml +++ b/dockge/affine_stable-e98f035/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-1623f5d/envs/default.env b/dockge/affine_stable-e98f035/envs/default.env similarity index 100% rename from dockge/affine_stable-1623f5d/envs/default.env rename to dockge/affine_stable-e98f035/envs/default.env diff --git a/dockge/affine_stable-1623f5d/envs/global.env b/dockge/affine_stable-e98f035/envs/global.env similarity index 100% rename from dockge/affine_stable-1623f5d/envs/global.env rename to dockge/affine_stable-e98f035/envs/global.env diff --git a/dockge/alist-aria2/.env b/dockge/alist-aria2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-aria2/.env +++ b/dockge/alist-aria2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index a6913980a..d11a2d481 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist-aria2: + openlist: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist-aria2:v3.40.0 + image: openlistteam/openlist:v4.0.2-aria2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_4_0_2/.env b/dockge/alist-aria2_3_40_0/.env similarity index 93% rename from dockge/alist-ffmpeg_4_0_2/.env rename to dockge/alist-aria2_3_40_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg_4_0_2/.env +++ b/dockge/alist-aria2_3_40_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2_4_0_2/docker-compose.yml b/dockge/alist-aria2_3_40_0/docker-compose.yml similarity index 85% rename from dockge/alist-aria2_4_0_2/docker-compose.yml rename to dockge/alist-aria2_3_40_0/docker-compose.yml index d11a2d481..a6913980a 100644 --- a/dockge/alist-aria2_4_0_2/docker-compose.yml +++ b/dockge/alist-aria2_3_40_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist-aria2: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-aria2 + image: qyg2297248353/alist-aria2:v3.40.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_4_0_2/envs/default.env b/dockge/alist-aria2_3_40_0/envs/default.env similarity index 100% rename from dockge/alist-aria2_4_0_2/envs/default.env rename to dockge/alist-aria2_3_40_0/envs/default.env diff --git a/dockge/alist-aria2_4_0_2/envs/global.env b/dockge/alist-aria2_3_40_0/envs/global.env similarity index 100% rename from dockge/alist-aria2_4_0_2/envs/global.env rename to dockge/alist-aria2_3_40_0/envs/global.env diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: openlistteam/openlist:v4.0.2-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_4_0_2/.env b/dockge/alist-ffmpeg_3_45_0/.env similarity index 93% rename from dockge/alist_4_0_2/.env rename to dockge/alist-ffmpeg_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist_4_0_2/.env +++ b/dockge/alist-ffmpeg_3_45_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg_4_0_2/docker-compose.yml b/dockge/alist-ffmpeg_3_45_0/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_4_0_2/docker-compose.yml rename to dockge/alist-ffmpeg_3_45_0/docker-compose.yml index ded9a5b7e..37149a612 100644 --- a/dockge/alist-ffmpeg_4_0_2/docker-compose.yml +++ b/dockge/alist-ffmpeg_3_45_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_4_0_2/envs/default.env b/dockge/alist-ffmpeg_3_45_0/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_4_0_2/envs/default.env rename to dockge/alist-ffmpeg_3_45_0/envs/default.env diff --git a/dockge/alist-ffmpeg_4_0_2/envs/global.env b/dockge/alist-ffmpeg_3_45_0/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_4_0_2/envs/global.env rename to dockge/alist-ffmpeg_3_45_0/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: openlistteam/openlist:v4.0.2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_4_0_2/.env b/dockge/alist_3_45_0/.env similarity index 93% rename from dockge/alist-aria2_4_0_2/.env rename to dockge/alist_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-aria2_4_0_2/.env +++ b/dockge/alist_3_45_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist_4_0_2/docker-compose.yml b/dockge/alist_3_45_0/docker-compose.yml similarity index 86% rename from dockge/alist_4_0_2/docker-compose.yml rename to dockge/alist_3_45_0/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist_4_0_2/docker-compose.yml +++ b/dockge/alist_3_45_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_4_0_2/envs/default.env b/dockge/alist_3_45_0/envs/default.env similarity index 100% rename from dockge/alist_4_0_2/envs/default.env rename to dockge/alist_3_45_0/envs/default.env diff --git a/dockge/alist_4_0_2/envs/global.env b/dockge/alist_3_45_0/envs/global.env similarity index 100% rename from dockge/alist_4_0_2/envs/global.env rename to dockge/alist_3_45_0/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index ac22205db..f70ce3cc2 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/docker-compose.yml @@ -4,8 +4,6 @@ networks: services: archivebox: container_name: archivebox - depends_on: - - archivebox-init env_file: - ./envs/global.env - .env @@ -16,7 +14,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 + image: archivebox/archivebox:0.7.3 labels: createdBy: Apps networks: @@ -26,26 +24,6 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data - archivebox-init: - command: archivebox init - container_name: init-archivebox - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - ALLOWED_HOSTS=* - - CSRF_TRUSTED_ORIGINS=http://localhost:8000 - - SEARCH_BACKEND_ENGINE=sonic - - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 - labels: - createdBy: Apps - networks: - - 1panel-network - volumes: - - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_7_3/.env b/dockge/archivebox_0_8_5rc51/.env similarity index 100% rename from dockge/archivebox_0_7_3/.env rename to dockge/archivebox_0_8_5rc51/.env diff --git a/dockge/archivebox_0_7_3/docker-compose.yml b/dockge/archivebox_0_8_5rc51/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_7_3/docker-compose.yml rename to dockge/archivebox_0_8_5rc51/docker-compose.yml index f70ce3cc2..ac22205db 100644 --- a/dockge/archivebox_0_7_3/docker-compose.yml +++ b/dockge/archivebox_0_8_5rc51/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: archivebox: container_name: archivebox + depends_on: + - archivebox-init env_file: - ./envs/global.env - .env @@ -14,7 +16,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.7.3 + image: archivebox/archivebox:0.8.5rc51 labels: createdBy: Apps networks: @@ -24,6 +26,26 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data + archivebox-init: + command: archivebox init + container_name: init-archivebox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - ALLOWED_HOSTS=* + - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - SEARCH_BACKEND_ENGINE=sonic + - SEARCH_BACKEND_HOST_NAME=archivebox-sonic + - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} + image: archivebox/archivebox:0.8.5rc51 + labels: + createdBy: Apps + networks: + - 1panel-network + volumes: + - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_7_3/envs/default.env b/dockge/archivebox_0_8_5rc51/envs/default.env similarity index 100% rename from dockge/archivebox_0_7_3/envs/default.env rename to dockge/archivebox_0_8_5rc51/envs/default.env diff --git a/dockge/archivebox_0_7_3/envs/global.env b/dockge/archivebox_0_8_5rc51/envs/global.env similarity index 100% rename from dockge/archivebox_0_7_3/envs/global.env rename to dockge/archivebox_0_8_5rc51/envs/global.env diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index c022ffc91..7afe99e91 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.8.121 + image: mlikiowa/napcat-docker:v4.8.122 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/dockge/baota/docker-compose.yml b/dockge/baota/docker-compose.yml index c28254802..678152df3 100644 --- a/dockge/baota/docker-compose.yml +++ b/dockge/baota/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:9.0_lts_latest + image: btpanel/baota:10.0_lts labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_10_0/.env b/dockge/baota_9_0/.env similarity index 100% rename from dockge/baota_10_0/.env rename to dockge/baota_9_0/.env diff --git a/dockge/baota_10_0/docker-compose.yml b/dockge/baota_9_0/docker-compose.yml similarity index 92% rename from dockge/baota_10_0/docker-compose.yml rename to dockge/baota_9_0/docker-compose.yml index 678152df3..c28254802 100644 --- a/dockge/baota_10_0/docker-compose.yml +++ b/dockge/baota_9_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:10.0_lts + image: btpanel/baota:9.0_lts_latest labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_10_0/envs/default.env b/dockge/baota_9_0/envs/default.env similarity index 100% rename from dockge/baota_10_0/envs/default.env rename to dockge/baota_9_0/envs/default.env diff --git a/dockge/baota_10_0/envs/global.env b/dockge/baota_9_0/envs/global.env similarity index 100% rename from dockge/baota_10_0/envs/global.env rename to dockge/baota_9_0/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index c68c76b14..af4782f89 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_1_6_8/.env b/dockge/bili-fetcher_latest/.env similarity index 100% rename from dockge/bili-fetcher_1_6_8/.env rename to dockge/bili-fetcher_latest/.env diff --git a/dockge/bili-fetcher_1_6_8/config/categories.json b/dockge/bili-fetcher_latest/config/categories.json similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/categories.json rename to dockge/bili-fetcher_latest/config/categories.json diff --git a/dockge/bili-fetcher_1_6_8/config/config.yaml b/dockge/bili-fetcher_latest/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/config.yaml rename to dockge/bili-fetcher_latest/config/config.yaml diff --git a/dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml b/dockge/bili-fetcher_latest/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml rename to dockge/bili-fetcher_latest/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py b/dockge/bili-fetcher_latest/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py rename to dockge/bili-fetcher_latest/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py b/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_latest/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_1_6_8/config/template.html b/dockge/bili-fetcher_latest/config/template.html similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/template.html rename to dockge/bili-fetcher_latest/config/template.html diff --git a/dockge/bili-fetcher_1_6_8/docker-compose.yml b/dockge/bili-fetcher_latest/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_1_6_8/docker-compose.yml rename to dockge/bili-fetcher_latest/docker-compose.yml index af4782f89..c68c76b14 100644 --- a/dockge/bili-fetcher_1_6_8/docker-compose.yml +++ b/dockge/bili-fetcher_latest/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.8 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.8 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_1_6_8/envs/default.env b/dockge/bili-fetcher_latest/envs/default.env similarity index 100% rename from dockge/bili-fetcher_1_6_8/envs/default.env rename to dockge/bili-fetcher_latest/envs/default.env diff --git a/dockge/bili-fetcher_1_6_8/envs/global.env b/dockge/bili-fetcher_latest/envs/global.env similarity index 100% rename from dockge/bili-fetcher_1_6_8/envs/global.env rename to dockge/bili-fetcher_latest/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index 095cf8284..d618229ca 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.1.5 + image: elasticsearch:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_19_5/.env b/dockge/elastic-elasticsearch_9_1_5/.env similarity index 100% rename from dockge/elastic-elasticsearch_8_19_5/.env rename to dockge/elastic-elasticsearch_9_1_5/.env diff --git a/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml b/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_8_19_5/docker-compose.yml rename to dockge/elastic-elasticsearch_9_1_5/docker-compose.yml index d618229ca..095cf8284 100644 --- a/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml +++ b/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.5 + image: elasticsearch:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_19_5/envs/default.env b/dockge/elastic-elasticsearch_9_1_5/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_8_19_5/envs/default.env rename to dockge/elastic-elasticsearch_9_1_5/envs/default.env diff --git a/dockge/elastic-elasticsearch_8_19_5/envs/global.env b/dockge/elastic-elasticsearch_9_1_5/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_8_19_5/envs/global.env rename to dockge/elastic-elasticsearch_9_1_5/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index 1a784d0e3..c7d0828cd 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.1.5 + image: kibana:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_19_5/.env b/dockge/elastic-kibana_9_1_5/.env similarity index 100% rename from dockge/elastic-kibana_8_19_5/.env rename to dockge/elastic-kibana_9_1_5/.env diff --git a/dockge/elastic-kibana_8_19_5/docker-compose.yml b/dockge/elastic-kibana_9_1_5/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_8_19_5/docker-compose.yml rename to dockge/elastic-kibana_9_1_5/docker-compose.yml index c7d0828cd..1a784d0e3 100644 --- a/dockge/elastic-kibana_8_19_5/docker-compose.yml +++ b/dockge/elastic-kibana_9_1_5/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.19.5 + image: kibana:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_19_5/envs/default.env b/dockge/elastic-kibana_9_1_5/envs/default.env similarity index 100% rename from dockge/elastic-kibana_8_19_5/envs/default.env rename to dockge/elastic-kibana_9_1_5/envs/default.env diff --git a/dockge/elastic-kibana_8_19_5/envs/global.env b/dockge/elastic-kibana_9_1_5/envs/global.env similarity index 100% rename from dockge/elastic-kibana_8_19_5/envs/global.env rename to dockge/elastic-kibana_9_1_5/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index 1e9567477..a461e63ac 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_2_4/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_2_4/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_2_4/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_2_4/docker-compose.yml index a461e63ac..1e9567477 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_2_4/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/emby_4_9_2_4/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_2_4/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_2_4/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_2_4/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 06b42b32c..8568f94b3 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/ajnart/homarr:0.16.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_0/.env b/dockge/homarr_1_41_0/.env similarity index 67% rename from dockge/homarr_0_16_0/.env rename to dockge/homarr_1_41_0/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr_0_16_0/.env +++ b/dockge/homarr_1_41_0/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr_0_16_0/docker-compose.yml b/dockge/homarr_1_41_0/docker-compose.yml similarity index 89% rename from dockge/homarr_0_16_0/docker-compose.yml rename to dockge/homarr_1_41_0/docker-compose.yml index 8568f94b3..06b42b32c 100644 --- a/dockge/homarr_0_16_0/docker-compose.yml +++ b/dockge/homarr_1_41_0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_0/envs/default.env b/dockge/homarr_1_41_0/envs/default.env similarity index 100% rename from dockge/homarr_0_16_0/envs/default.env rename to dockge/homarr_1_41_0/envs/default.env diff --git a/dockge/homarr_0_16_0/envs/global.env b/dockge/homarr_1_41_0/envs/global.env similarity index 100% rename from dockge/homarr_0_16_0/envs/global.env rename to dockge/homarr_1_41_0/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 39b4c1ba0..142aaa4d5 100644 --- a/dockge/iyuu-plus/docker-compose.yml +++ b/dockge/iyuu-plus/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest-mysql/.env b/dockge/iyuu-plus_latest/.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/.env rename to dockge/iyuu-plus_latest/.env diff --git a/dockge/iyuu-plus_latest-mysql/docker-compose.yml b/dockge/iyuu-plus_latest/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest-mysql/docker-compose.yml rename to dockge/iyuu-plus_latest/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus_latest-mysql/docker-compose.yml +++ b/dockge/iyuu-plus_latest/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus:latest + image: iyuucn/iyuuplus-nodb:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest-mysql/envs/default.env b/dockge/iyuu-plus_latest/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/envs/default.env rename to dockge/iyuu-plus_latest/envs/default.env diff --git a/dockge/iyuu-plus_latest-mysql/envs/global.env b/dockge/iyuu-plus_latest/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/envs/global.env rename to dockge/iyuu-plus_latest/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.env @@ -4,9 +4,12 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 [必填] +# API 端口 (映射内部端口) [必填] PANEL_APP_PORT_API=9000 +# API 内部端口 [必填] +MINIO_API_PORT=9000 + # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index 2bc78e830..4e37e835a 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-09-07T16-13-09Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-09-07/.env b/dockge/minio_2025-04-22/.env similarity index 86% rename from dockge/minio_2025-09-07/.env rename to dockge/minio_2025-04-22/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio_2025-09-07/.env +++ b/dockge/minio_2025-04-22/.env @@ -4,12 +4,9 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 (映射内部端口) [必填] +# API 端口 [必填] PANEL_APP_PORT_API=9000 -# API 内部端口 [必填] -MINIO_API_PORT=9000 - # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio_2025-09-07/docker-compose.yml b/dockge/minio_2025-04-22/docker-compose.yml similarity index 83% rename from dockge/minio_2025-09-07/docker-compose.yml rename to dockge/minio_2025-04-22/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio_2025-09-07/docker-compose.yml +++ b/dockge/minio_2025-04-22/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-09-07/envs/default.env b/dockge/minio_2025-04-22/envs/default.env similarity index 100% rename from dockge/minio_2025-09-07/envs/default.env rename to dockge/minio_2025-04-22/envs/default.env diff --git a/dockge/minio_2025-09-07/envs/global.env b/dockge/minio_2025-04-22/envs/global.env similarity index 100% rename from dockge/minio_2025-09-07/envs/global.env rename to dockge/minio_2025-04-22/envs/global.env diff --git a/dockge/moontv/.env b/dockge/moontv/.env index 4f33d3980..c1e2d49fa 100644 --- a/dockge/moontv/.env +++ b/dockge/moontv/.env @@ -4,6 +4,9 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 +# Authorization Code [必填] +AUTH_TOKEN= + # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv/docker-compose.yml b/dockge/moontv/docker-compose.yml index eedce5001..399cbb8a3 100644 --- a/dockge/moontv/docker-compose.yml +++ b/dockge/moontv/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:latest + image: ghcr.io/moontechlab/lunatv:4.3.0 labels: createdBy: Apps networks: diff --git a/dockge/moontv_4_3_0/.env b/dockge/moontv_latest/.env similarity index 95% rename from dockge/moontv_4_3_0/.env rename to dockge/moontv_latest/.env index c1e2d49fa..4f33d3980 100644 --- a/dockge/moontv_4_3_0/.env +++ b/dockge/moontv_latest/.env @@ -4,9 +4,6 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 -# Authorization Code [必填] -AUTH_TOKEN= - # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv_4_3_0/docker-compose.yml b/dockge/moontv_latest/docker-compose.yml similarity index 87% rename from dockge/moontv_4_3_0/docker-compose.yml rename to dockge/moontv_latest/docker-compose.yml index 399cbb8a3..eedce5001 100644 --- a/dockge/moontv_4_3_0/docker-compose.yml +++ b/dockge/moontv_latest/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:4.3.0 + image: ghcr.io/moontechlab/lunatv:latest labels: createdBy: Apps networks: diff --git a/dockge/moontv_4_3_0/envs/default.env b/dockge/moontv_latest/envs/default.env similarity index 100% rename from dockge/moontv_4_3_0/envs/default.env rename to dockge/moontv_latest/envs/default.env diff --git a/dockge/moontv_4_3_0/envs/global.env b/dockge/moontv_latest/envs/global.env similarity index 100% rename from dockge/moontv_4_3_0/envs/global.env rename to dockge/moontv_latest/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index 6d6e1a932..c53ca32dc 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,42 +1,20 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - [mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache +host_cache_size=0 skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files user=mysql -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M +mysql_native_password=ON character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 +log_bin_trust_function_creators=1 +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index 5cac14f48..ba5d56398 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,14 +5,13 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --lower_case_table_names=1 - - --collation-server=utf8mb4_general_ci - - --explicit_defaults_for_timestamp=true + - --collation-server=utf8mb4_unicode_ci + - --mysql-native-password=ON container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:5.7.44 + image: mysql:8.4.6 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_8_4_6/.env b/dockge/mysql_5_7_44/.env similarity index 100% rename from dockge/mysql_8_4_6/.env rename to dockge/mysql_5_7_44/.env diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf new file mode 100644 index 000000000..6d6e1a932 --- /dev/null +++ b/dockge/mysql_5_7_44/config/my.cnf @@ -0,0 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + +[mysqld] +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files +user=mysql + +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M +character_set_server=utf8mb4 +lower_case_table_names=1 +group_concat_max_len=1024000 + +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_8_4_6/docker-compose.yml b/dockge/mysql_5_7_44/docker-compose.yml similarity index 65% rename from dockge/mysql_8_4_6/docker-compose.yml rename to dockge/mysql_5_7_44/docker-compose.yml index ba5d56398..5cac14f48 100644 --- a/dockge/mysql_8_4_6/docker-compose.yml +++ b/dockge/mysql_5_7_44/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.6 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_8_4_6/envs/default.env b/dockge/mysql_5_7_44/envs/default.env similarity index 100% rename from dockge/mysql_8_4_6/envs/default.env rename to dockge/mysql_5_7_44/envs/default.env diff --git a/dockge/mysql_8_4_6/envs/global.env b/dockge/mysql_5_7_44/envs/global.env similarity index 100% rename from dockge/mysql_8_4_6/envs/global.env rename to dockge/mysql_5_7_44/envs/global.env diff --git a/dockge/mysql_8_4_6/config/my.cnf b/dockge/mysql_8_4_6/config/my.cnf deleted file mode 100644 index c53ca32dc..000000000 --- a/dockge/mysql_8_4_6/config/my.cnf +++ /dev/null @@ -1,20 +0,0 @@ -[mysqld] -host_cache_size=0 -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -user=mysql - -mysql_native_password=ON -character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci -lower_case_table_names=1 -group_concat_max_len=1024000 -log_bin_trust_function_creators=1 - -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index cf220b000..7e925e038 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_1/.env b/dockge/nacos_2_4_3/.env similarity index 100% rename from dockge/nacos_2_5_1/.env rename to dockge/nacos_2_4_3/.env diff --git a/dockge/nacos_2_5_1/docker-compose.yml b/dockge/nacos_2_4_3/docker-compose.yml similarity index 94% rename from dockge/nacos_2_5_1/docker-compose.yml rename to dockge/nacos_2_4_3/docker-compose.yml index 7e925e038..cf220b000 100644 --- a/dockge/nacos_2_5_1/docker-compose.yml +++ b/dockge/nacos_2_4_3/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_1/envs/default.env b/dockge/nacos_2_4_3/envs/default.env similarity index 100% rename from dockge/nacos_2_5_1/envs/default.env rename to dockge/nacos_2_4_3/envs/default.env diff --git a/dockge/nacos_2_5_1/envs/global.env b/dockge/nacos_2_4_3/envs/global.env similarity index 100% rename from dockge/nacos_2_5_1/envs/global.env rename to dockge/nacos_2_4_3/envs/global.env diff --git a/dockge/nacos_2_5_1/init/mysql-schema.sql b/dockge/nacos_2_4_3/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_2_5_1/init/mysql-schema.sql rename to dockge/nacos_2_4_3/init/mysql-schema.sql diff --git a/dockge/open-webui/docker-compose.yml b/dockge/open-webui/docker-compose.yml index a17822f98..a12b5476b 100644 --- a/dockge/open-webui/docker-compose.yml +++ b/dockge/open-webui/docker-compose.yml @@ -15,7 +15,7 @@ services: - ENABLE_OLLAMA_API=True - ENABLE_OPENAI_API=False - https_proxy=${http_proxy} - image: ghcr.io/open-webui/open-webui:0.6.33 + image: ghcr.io/open-webui/open-webui:0.6.34 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis/docker-compose.yml b/dockge/postgresql-postgis/docker-compose.yml index eded4fd3c..a2cced821 100644 --- a/dockge/postgresql-postgis/docker-compose.yml +++ b/dockge/postgresql-postgis/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:16-3.5 + image: postgis/postgis:17-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_17-3_5/.env b/dockge/postgresql-postgis_16-3_5/.env similarity index 100% rename from dockge/postgresql-postgis_17-3_5/.env rename to dockge/postgresql-postgis_16-3_5/.env diff --git a/dockge/postgresql-postgis_17-3_5/docker-compose.yml b/dockge/postgresql-postgis_16-3_5/docker-compose.yml similarity index 94% rename from dockge/postgresql-postgis_17-3_5/docker-compose.yml rename to dockge/postgresql-postgis_16-3_5/docker-compose.yml index a2cced821..eded4fd3c 100644 --- a/dockge/postgresql-postgis_17-3_5/docker-compose.yml +++ b/dockge/postgresql-postgis_16-3_5/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:17-3.5 + image: postgis/postgis:16-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_17-3_5/envs/default.env b/dockge/postgresql-postgis_16-3_5/envs/default.env similarity index 100% rename from dockge/postgresql-postgis_17-3_5/envs/default.env rename to dockge/postgresql-postgis_16-3_5/envs/default.env diff --git a/dockge/postgresql-postgis_17-3_5/envs/global.env b/dockge/postgresql-postgis_16-3_5/envs/global.env similarity index 100% rename from dockge/postgresql-postgis_17-3_5/envs/global.env rename to dockge/postgresql-postgis_16-3_5/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index e8ef19ae8..9724e766c 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg14-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:17.6-alpine + image: postgres:14 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14/.env b/dockge/postgresql_17_6-alpine/.env similarity index 100% rename from dockge/postgresql_pg14/.env rename to dockge/postgresql_17_6-alpine/.env diff --git a/dockge/postgresql_pg14/docker-compose.yml b/dockge/postgresql_17_6-alpine/docker-compose.yml similarity index 89% rename from dockge/postgresql_pg14/docker-compose.yml rename to dockge/postgresql_17_6-alpine/docker-compose.yml index 9724e766c..e8ef19ae8 100644 --- a/dockge/postgresql_pg14/docker-compose.yml +++ b/dockge/postgresql_17_6-alpine/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:14 + image: postgres:17.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14/envs/default.env b/dockge/postgresql_17_6-alpine/envs/default.env similarity index 100% rename from dockge/postgresql_pg14/envs/default.env rename to dockge/postgresql_17_6-alpine/envs/default.env diff --git a/dockge/postgresql_pg14/envs/global.env b/dockge/postgresql_17_6-alpine/envs/global.env similarity index 100% rename from dockge/postgresql_pg14/envs/global.env rename to dockge/postgresql_17_6-alpine/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458b..116044519 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/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:4.6.7 + image: linuxserver/qbittorrent:5.1.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_2/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_1_2/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_1_2/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_1_2/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index 116044519..5ec4b458b 100644 --- a/dockge/qbittorrent_5_1_2/docker-compose.yml +++ b/dockge/qbittorrent_4_6_7/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.1.2 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_2/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_1_2/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/qbittorrent_5_1_2/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_1_2/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env diff --git a/dockge/redis/config/redis.conf b/dockge/redis/config/redis.conf index 8795ae291..ca22ec9f6 100644 --- a/dockge/redis/config/redis.conf +++ b/dockge/redis/config/redis.conf @@ -32,17 +32,8 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # -# Included paths may contain wildcards. All files matching the wildcards will -# be included in alphabetical order. -# Note that if an include path contains a wildcards but no files match it when -# the server is started, the include statement will be ignored and no error will -# be emitted. It is safe, therefore, to include wildcard files from empty -# directories. -# # include /path/to/local.conf # include /path/to/other.conf -# include /path/to/fragments/*.conf -# ################################## MODULES ##################################### @@ -58,81 +49,43 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. -# Each address can be prefixed by "-", which means that redis will not fail to -# start if the address is not available. Being not available only refers to -# addresses that does not correspond to any network interface. Addresses that -# are already in use will always fail, and unsupported protocols will always BE -# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses -# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 -# bind * -::* # like the default, all available interfaces +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis -# will only be able to accept client connections from the same host that it is -# running on). +# IPv4 loopback interface address (this means Redis will only be able to +# accept client connections from the same host that it is running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# COMMENT OUT THE FOLLOWING LINE. -# -# You will also need to set a password unless you explicitly disable protected -# mode. +# JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 -# By default, outgoing connections (from replica to master, from Sentinel to -# instances, cluster bus, etc.) are not bound to a specific local address. In -# most cases, this means the operating system will handle that based on routing -# and the interface through which the connection goes out. -# -# Using bind-source-addr it is possible to configure a specific address to bind -# to, which may also affect how the connection gets routed. -# -# Example: -# -# bind-source-addr 10.0.0.1 - # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and the default user has no password, the server -# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address -# (::1) or Unix domain sockets. +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured. +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. protected-mode yes -# Redis uses default hardened security configuration directives to reduce the -# attack surface on innocent users. Therefore, several sensitive configuration -# directives are immutable, and some potentially-dangerous commands are blocked. -# -# Configuration directives that control files that Redis writes to (e.g., 'dir' -# and 'dbfilename') and that aren't usually modified during runtime -# are protected by making them immutable. -# -# Commands that can increase the attack surface of Redis and that aren't usually -# called by users are blocked by default. -# -# These can be exposed to either all connections or just local ones by setting -# each of the configs listed below to either of these values: -# -# no - Block for any connection (remain immutable) -# yes - Allow for any connection (no protection) -# local - Allow only for local connections. Ones originating from the -# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. -# -# enable-protected-configs no -# enable-debug-command no -# enable-module-command no - # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -152,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /run/redis.sock +# unixsocket /tmp/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -175,16 +128,6 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 -# Apply OS-specific mechanism to mark the listening socket with the specified -# ID, to support advanced routing and filtering capabilities. -# -# On Linux, the ID represents a connection mark. -# On FreeBSD, the ID represents a socket cookie ID. -# On OpenBSD, the ID represents a route table ID. -# -# The default value is 0, which implies no marking is required. -# socket-mark-id 0 - ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -200,32 +143,8 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-key-file-pass secret -# Normally Redis uses the same certificate for both server functions (accepting -# connections) and client functions (replicating from a master, establishing -# cluster bus connections, etc.). -# -# Sometimes certificates are issued with attributes that designate them as -# client-only or server-only certificates. In that case it may be desired to use -# different certificates for incoming (server) and outgoing (client) -# connections. To do that, use the following directives: -# -# tls-client-cert-file client.crt -# tls-client-key-file client.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-client-key-file-pass secret - -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, -# required by older versions of OpenSSL (<3.0). Newer versions do not require -# this configuration and recommend against it. +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # # tls-dh-params-file redis.dh @@ -258,12 +177,9 @@ tcp-keepalive 300 # # tls-cluster yes -# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended -# that older formally deprecated versions are kept disabled to reduce the attack surface. -# You can explicitly specify TLS versions to support. -# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", -# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. -# To enable only TLSv1.2 and TLSv1.3, use: +# Explicitly specify TLS versions to support. Allowed values are case insensitive +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or +# any combination. To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -305,7 +221,6 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -314,17 +229,11 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET -# on startup, and updating Redis status on a regular -# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -# -# The default is "no". To run under upstart/systemd, you can simply uncomment -# the line below: -# -# supervised auto +supervised no # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -335,9 +244,6 @@ daemonize no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -# -# Note that on modern Linux systems "/run/redis.pid" is more conforming -# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -363,74 +269,44 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 -# To disable the built in crash log, which will possibly produce cleaner core -# dumps when they are needed, uncomment the following: -# -# crash-log-enabled no - -# To disable the fast memory check that's run as part of the crash log, which -# will possibly let redis terminate sooner, uncomment the following: -# -# crash-memcheck-enabled no - # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY and syslog logging is -# disabled. Basically this means that normally a logo is displayed only in -# interactive sessions. +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo no - -# By default, Redis modifies the process title (as seen in 'top' and 'ps') to -# provide some runtime information. It is possible to disable this and leave -# the process name as executed by setting the following to no. -set-proc-title yes - -# When changing the process title, Redis uses the following template to construct -# the modified title. -# -# Template variables are specified in curly brackets. The following variables are -# supported: -# -# {title} Name of process as executed if parent, or type of child process. -# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or -# Unix socket if only that's available. -# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". -# {port} TCP port listening on, or 0. -# {tls-port} TLS port listening on, or 0. -# {unixsocket} Unix domain socket listening on, or "". -# {config-file} Name of configuration file used. -# -proc-title-template "{title} {listen-addr} {server-mode}" +always-show-logo yes ################################ SNAPSHOTTING ################################ +# +# Save the DB on disk: +# +# save +# +# Will save the DB if both the given number of seconds and the given +# number of write operations against the DB occurred. +# +# In the example below the behavior will be to save: +# after 900 sec (15 min) if at least 1 key changed +# after 300 sec (5 min) if at least 10 keys changed +# after 60 sec if at least 10000 keys changed +# +# Note: you can disable saving completely by commenting out all "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" -# Save the DB to disk. -# -# save [ ...] -# -# Redis will save the DB if the given number of seconds elapsed and it -# surpassed the given number of write operations against the DB. -# -# Snapshotting can be completely disabled with a single empty string argument -# as in following example: -# -# save "" -# -# Unless specified otherwise, by default Redis will save the DB: -# * After 3600 seconds (an hour) if at least 1 change was performed -# * After 300 seconds (5 minutes) if at least 100 changes were performed -# * After 60 seconds if at least 10000 changes were performed -# -# You can set these explicitly by uncommenting the following line. -# -# save 3600 1 300 100 60 10000 +save 900 1 +save 300 10 +save 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -462,21 +338,6 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes -# Enables or disables full sanitization checks for ziplist and listpack etc when -# loading an RDB or RESTORE payload. This reduces the chances of a assertion or -# crash later on while processing commands. -# Options: -# no - Never perform full sanitization -# yes - Always perform full sanitization -# clients - Perform full sanitization only for user connections. -# Excludes: RDB files, RESTORE commands received from the master -# connection, and client connections which have the -# skip-sanitize-payload ACL flag. -# The default should be 'clients' but since it currently affects cluster -# resharding via MIGRATE, it is temporarily set to 'no' by default. -# -# sanitize-dump-payload no - # The filename where to dump the DB dbfilename dump.rdb @@ -551,10 +412,9 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error -# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" -# to all data access commands, excluding commands such as: -# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with +# an error "SYNC with master in progress" to all commands except: +# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -603,7 +463,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync yes +repl-diskless-sync no # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -617,18 +477,12 @@ repl-diskless-sync yes # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# When diskless replication is enabled with a delay, it is possible to let -# the replication start before the maximum delay is reached if the maximum -# number of replicas expected have connected. Default of 0 means that the -# maximum is not defined and Redis will wait the full delay. -repl-diskless-sync-max-replicas 0 - # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if you know what you are doing. +# stage with the master. Use only if your do what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -637,23 +491,19 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and replica buffers). +# Copy on Write memory and salve buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep current db contents in RAM while parsing the data directly -# from the socket. Replicas in this mode can keep serving current -# data set while replication is in progress, except for cases where -# they can't recognize master as having a data set from same -# replication history. -# Note that this requires sufficient memory, if you don't have it, -# you risk an OOM kill. +# "swapdb" - Keep a copy of the current db contents in RAM while parsing +# the data directly from the socket. note that this requires +# sufficient memory, if you don't have it, you risk an OOM kill. repl-diskless-load disabled -# Master send PINGs to its replicas in a predefined interval. It's possible to +# Replicas send PINGs to server in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -728,43 +578,6 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 -# The propagation error behavior controls how Redis will behave when it is -# unable to handle a command being processed in the replication stream from a master -# or processed while reading from an AOF file. Errors that occur during propagation -# are unexpected, and can cause data inconsistency. However, there are edge cases -# in earlier versions of Redis where it was possible for the server to replicate or persist -# commands that would fail on future versions. For this reason the default behavior -# is to ignore such errors and continue processing commands. -# -# If an application wants to ensure there is no data divergence, this configuration -# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' -# to only panic when a replica encounters an error on the replication stream. One of -# these two panic values will become the default value in the future once there are -# sufficient safety mechanisms in place to prevent false positive crashes. -# -# propagation-error-behavior ignore - -# Replica ignore disk write errors controls the behavior of a replica when it is -# unable to persist a write command received from its master to disk. By default, -# this configuration is set to 'no' and will crash the replica in this condition. -# It is not recommended to change this default, however in order to be compatible -# with older versions of Redis this config can be toggled to 'yes' which will just -# log a warning and execute the write command it got from the master. -# -# replica-ignore-disk-write-errors no - -# ----------------------------------------------------------------------------- -# By default, Redis Sentinel includes all replicas in its reports. A replica -# can be excluded from Redis Sentinel's announcements. An unannounced replica -# will be ignored by the 'sentinel replicas ' command and won't be -# exposed to Redis Sentinel's clients. -# -# This option does not change the behavior of replica-priority. Even with -# replica-announced set to 'no', the replica can be promoted to master. To -# prevent this behavior, set replica-priority to 0. -# -# replica-announced yes - # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -820,7 +633,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# a radix key indexed by key name, what clients have which keys. In turn +# 16 millions of slots, what clients may have certain subsets of keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -884,12 +697,8 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. -# sanitize-payload RESTORE dump-payload is sanitized (default). -# + Allow the execution of that command. -# May be used with `|` for allowing subcommands (e.g "+config|get") -# - Disallow the execution of that command. -# May be used with `|` for blocking subcommands (e.g "-config|set") +# + Allow the execution of that command +# - Disallow the execution of that command # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -897,11 +706,10 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|first-arg Allow a specific first argument of an otherwise -# disabled command. It is only supported on commands with -# no sub-commands, and is not allowed as negative form -# like -SELECT|1, only additive starting with "+". This -# feature is deprecated and may be removed in the future. +# +|subcommand Allow a specific subcommand of an otherwise +# disabled command. Note that this form is not +# allowed as negative like -DEBUG|SEGFAULT, but +# only additive starting with "+". # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -909,17 +717,8 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read -# from. -# %W~ Add key write pattern that specifies which keys can be -# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. -# & Add a glob-style pattern of Pub/Sub channels that can be -# accessed by the user. It is possible to specify multiple channel -# patterns. -# allchannels Alias for &* -# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -938,14 +737,6 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. -# () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last -# character must be ). -# clearselectors Remove all of the currently attached selectors. -# Note this does not change the "root" user permissions, -# which are the permissions directly applied onto the -# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -967,40 +758,6 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # -# The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata -# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, -# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, -# key or metadata will also have `write` category. Commands that only read -# the keyspace, key or metadata will have the `read` category. -# * read - Reading from keys (values or metadata). Note that commands that don't -# interact with keys, will not have either `read` or `write`. -# * write - Writing to keys (values or metadata) -# * admin - Administrative commands. Normal applications will never need to use -# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. -# * dangerous - Potentially dangerous (each should be considered with care for -# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, -# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. -# * connection - Commands affecting the connection or other connections. -# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. -# * blocking - Potentially blocking the connection until released by another -# command. -# * fast - Fast O(1) commands. May loop on the number of arguments, but not the -# number of elements in the key. -# * slow - All commands that are not Fast. -# * pubsub - PUBLISH / SUBSCRIBE related -# * transaction - WATCH / MULTI / EXEC related commands. -# * scripting - Scripting related. -# * set - Data type: sets related. -# * sortedset - Data type: zsets related. -# * list - Data type: lists related. -# * hash - Data type: hashes related. -# * string - Data type: strings related. -# * bitmap - Data type: bitmaps related. -# * hyperloglog - Data type: hyperloglog related. -# * geo - Data type: geo related. -# * stream - Data type: streams related. -# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -1030,24 +787,8 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# The requirepass is not compatible with aclfile option and the ACL LOAD -# command, these will cause requirepass to be ignored. -# # requirepass foobared -# New users are initialized with restrictive permissions by default, via the -# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it -# is possible to manage access to Pub/Sub channels with ACL rules as well. The -# default Pub/Sub channels permission if new users is controlled by the -# acl-pubsub-default configuration directive, which accepts one of these values: -# -# allchannels: grants access to all Pub/Sub channels -# resetchannels: revokes access to all Pub/Sub channels -# -# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. -# -# acl-pubsub-default resetchannels - # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -1136,12 +877,14 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, when there are no suitable keys for -# eviction, Redis will return an error on write operations that require -# more memory. These are usually commands that create new keys, add data or -# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, -# SORT (due to the STORE argument), and EXEC (if the transaction includes any -# command that requires memory). +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append +# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd +# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby +# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby +# getset mset msetnx exec sort # # The default is: # @@ -1158,14 +901,6 @@ acllog-max-len 128 # # maxmemory-samples 5 -# Eviction processing is designed to function well with the default setting. -# If there is an unusually large amount of write traffic, this value may need to -# be increased. Decreasing this value may reduce latency at the risk of -# eviction processing effectiveness -# 0 = minimum latency, 10 = default, 100 = process without regard to latency -# -# maxmemory-eviction-tenacity 10 - # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -1259,13 +994,6 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous -# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the -# commands. When neither flag is passed, this directive will be used to determine -# if the data should be deleted asynchronously. - -lazyfree-lazy-user-flush no - ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1304,7 +1032,7 @@ lazyfree-lazy-user-flush no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Also, this feature currently does not work when SSL is +# CONFIG SET. Aso this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1322,7 +1050,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports these options: +# Redis supports three options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1343,19 +1071,6 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 - -#################### KERNEL transparent hugepage CONTROL ###################### - -# Usually the kernel Transparent Huge Pages control is set to "madvise" or -# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which -# case this config has no effect. On systems in which it is set to "always", -# redis will attempt to disable it specifically for the redis process in order -# to avoid latency problems specifically with fork(2) and CoW. -# If for some reason you prefer to keep it enabled, you can set this config to -# "no" and the kernel global to "always". - -disable-thp yes - ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1374,43 +1089,14 @@ disable-thp yes # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check https://redis.io/topics/persistence for more information. +# Please check http://redis.io/topics/persistence for more information. appendonly no -# The base name of the append only file. -# -# Redis 7 and newer use a set of append-only files to persist the dataset -# and changes applied to it. There are two basic types of files in use: -# -# - Base files, which are a snapshot representing the complete state of the -# dataset at the time the file was created. Base files can be either in -# the form of RDB (binary serialized) or AOF (textual commands). -# - Incremental files, which contain additional commands that were applied -# to the dataset following the previous file. -# -# In addition, manifest files are used to track the files and the order in -# which they were created and should be applied. -# -# Append-only file names are created by Redis following a specific pattern. -# The file name's prefix is based on the 'appendfilename' configuration -# parameter, followed by additional information about the sequence and type. -# -# For example, if appendfilename is set to appendonly.aof, the following file -# names could be derived: -# -# - appendonly.aof.1.base.rdb as a base file. -# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. -# - appendonly.aof.manifest as a manifest file. +# The name of the append only file (default: "appendonly.aof") appendfilename "appendonly.aof" -# For convenience, Redis stores all persistent append-only files in a dedicated -# directory. The name of the directory is determined by the appenddirname -# configuration parameter. - -appenddirname "appendonlydir" - # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1450,7 +1136,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync no". In practical terms, this means that it is +# the same as "appendfsync none". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1503,69 +1189,34 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# Redis can create append-only base files in either RDB or AOF formats. Using -# the RDB format is always faster and more efficient, and disabling it is only -# supported for backward compatibility purposes. +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading, Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, then continues loading the AOF +# tail. aof-use-rdb-preamble yes -# Redis supports recording timestamp annotations in the AOF to support restoring -# the data from a specific point-in-time. However, using this capability changes -# the AOF format in a way that may not be compatible with existing AOF parsers. -aof-timestamp-enabled no +################################ LUA SCRIPTING ############################### -################################ SHUTDOWN ##################################### - -# Maximum time to wait for replicas when shutting down, in seconds. +# Max execution time of a Lua script in milliseconds. # -# During shut down, a grace period allows any lagging replicas to catch up with -# the latest replication offset before the master exists. This period can -# prevent data loss, especially for deployments without configured disk backups. +# If the maximum execution time is reached Redis will log that a script is +# still in execution after the maximum allowed time and will start to +# reply to queries with an error. # -# The 'shutdown-timeout' value is the grace period's duration in seconds. It is -# only applicable when the instance has replicas. To disable the feature, set -# the value to 0. +# When a long running script exceeds the maximum execution time only the +# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be +# used to stop a script that did not yet call any write commands. The second +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural +# termination of the script. # -# shutdown-timeout 10 - -# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default -# an RDB snapshot is written to disk in a blocking operation if save points are configured. -# The options used on signaled shutdown can include the following values: -# default: Saves RDB snapshot only if save points are configured. -# Waits for lagging replicas to catch up. -# save: Forces a DB saving operation even if no save points are configured. -# nosave: Prevents DB saving operation even if one or more save points are configured. -# now: Skips waiting for lagging replicas. -# force: Ignores any errors that would normally prevent the server from exiting. -# -# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. -# Example: "nosave force now" -# -# shutdown-on-sigint default -# shutdown-on-sigterm default - -################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### - -# Maximum time in milliseconds for EVAL scripts, functions and in some cases -# modules' commands before Redis can start processing or rejecting other clients. -# -# If the maximum execution time is reached Redis will start to reply to most -# commands with a BUSY error. -# -# In this state Redis will only allow a handful of commands to be executed. -# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. -# -# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not -# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop -# the server in the case a write command was already issued by the script when -# the user doesn't want to wait for the natural termination of the script. -# -# The default is 5 seconds. It is possible to set it to 0 or a negative value -# to disable this mechanism (uninterrupted execution). Note that in the past -# this config had a different name, which is now an alias, so both of these do -# the same: -# lua-time-limit 5000 -# busy-reply-threshold 5000 +# Set it to 0 or a negative value for unlimited execution without warnings. +lua-time-limit 5000 ################################ REDIS CLUSTER ############################### @@ -1589,11 +1240,6 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires -# you to specify the cluster bus port when executing cluster meet. -# cluster-port 0 - # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1652,21 +1298,12 @@ aof-timestamp-enabled no # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value or -# set cluster-allow-replica-migration to 'no'. +# one replica). To disable migration just set it to a very large value. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 -# Turning off this option allows to use less automatic cluster configuration. -# It both disables migration to orphaned masters and migration from masters -# that became empty. -# -# Default is 'yes' (allow automatic migrations). -# -# cluster-allow-replica-migration yes - # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1681,7 +1318,7 @@ aof-timestamp-enabled no # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the replica can still perform a +# master during master failures. However the master can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1691,7 +1328,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1706,54 +1343,8 @@ aof-timestamp-enabled no # # cluster-allow-reads-when-down no -# This option, when set to yes, allows nodes to serve pubsub shard traffic while -# the cluster is in a down state, as long as it believes it owns the slots. -# -# This is useful if the application would like to use the pubsub feature even when -# the cluster global stable state is not OK. If the application wants to make sure only -# one shard is serving a given channel, this feature should be kept as yes. -# -# cluster-allow-pubsubshard-when-down yes - -# Cluster link send buffer limit is the limit on the memory usage of an individual -# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed -# this limit. This is to primarily prevent send buffers from growing unbounded on links -# toward slow peers (E.g. PubSub messages being piled up). -# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field -# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. -# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single -# PubSub message by default. (client-query-buffer-limit default value is 1gb) -# -# cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for -# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based -# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propagate the removal. -# -# cluster-announce-hostname "" - -# Clusters can advertise how clients should connect to them using either their IP address, -# a user defined hostname, or by declaring they have no endpoint. Which endpoint is -# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type -# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' -# will be returned instead. -# -# When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the -# server doesn't know which one the client took. In this case, the server is expecting -# the client to reach out on the same endpoint it used for making the last request, but use -# the port provided in the response. -# -# cluster-preferred-endpoint-type ip - # In order to setup your cluster make sure to read the documentation -# available at https://redis.io web site. +# available at http://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1763,21 +1354,16 @@ aof-timestamp-enabled no # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following four options are used for this scope, and are: +# following two options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port -# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client ports (for connections -# without and with TLS) and cluster message bus port. The information is then -# published in the header of the bus packets so that other nodes will be able to -# correctly map the address of the node publishing the information. -# -# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set -# to zero, then cluster-announce-port refers to the TLS port. Note also that -# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# Each instructs the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1790,8 +1376,7 @@ aof-timestamp-enabled no # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-tls-port 6379 -# cluster-announce-port 0 +# cluster-announce-port 6379 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1839,24 +1424,10 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 -################################ LATENCY TRACKING ############################## - -# The Redis extended latency monitoring tracks the per command latencies and enables -# exporting the percentile distribution via the INFO latencystats command, -# and cumulative latency distributions (histograms) via the LATENCY command. -# -# By default, the extended latency monitoring is enabled since the overhead -# of keeping track of the command latency is very small. -# latency-tracking yes - -# By default the exported latency percentiles via the INFO latencystats command -# are the p50, p99, and p999. -# latency-tracking-info-percentiles 50 99 99.9 - ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at https://redis.io/topics/notifications +# This feature is documented at http://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1878,11 +1449,9 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) -# n New key events (Note: not included in the 'A' class) # t Stream commands -# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# A Alias for g$lshzxet, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1905,13 +1474,71 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" +############################### GOPHER SERVER ################################# + +# Redis contains an implementation of the Gopher protocol, as specified in +# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). +# +# The Gopher protocol was very popular in the late '90s. It is an alternative +# to the web, and the implementation both server and client side is so simple +# that the Redis server has just 100 lines of code in order to implement this +# support. +# +# What do you do with Gopher nowadays? Well Gopher never *really* died, and +# lately there is a movement in order for the Gopher more hierarchical content +# composed of just plain text documents to be resurrected. Some want a simpler +# internet, others believe that the mainstream internet became too much +# controlled, and it's cool to create an alternative space for people that +# want a bit of fresh air. +# +# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol +# as a gift. +# +# --- HOW IT WORKS? --- +# +# The Redis Gopher support uses the inline protocol of Redis, and specifically +# two kind of inline requests that were anyway illegal: an empty request +# or any request that starts with "/" (there are no Redis commands starting +# with such a slash). Normal RESP2/RESP3 requests are completely out of the +# path of the Gopher protocol implementation and are served as usual as well. +# +# If you open a connection to Redis when Gopher is enabled and send it +# a string like "/foo", if there is a key named "/foo" it is served via the +# Gopher protocol. +# +# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher +# talking), you likely need a script like the following: +# +# https://github.com/antirez/gopher2redis +# +# --- SECURITY WARNING --- +# +# If you plan to put Redis on the internet in a publicly accessible address +# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. +# Once a password is set: +# +# 1. The Gopher server (when enabled, not by default) will still serve +# content via Gopher. +# 2. However other commands cannot be called before the client will +# authenticate. +# +# So use the 'requirepass' option to protect your instance. +# +# Note that Gopher is not currently supported when 'io-threads-do-reads' +# is enabled. +# +# To enable Gopher support, uncomment the following line and set the option +# from no (the default) to yes. +# +# gopher-enabled no + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-listpack-entries 512 -hash-max-listpack-value 64 +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1926,7 +1553,7 @@ hash-max-listpack-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-listpack-size -2 +list-max-ziplist-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1954,8 +1581,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-listpack-entries 128 -zset-max-listpack-value 64 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1977,7 +1604,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entries limit by setting max-bytes to 0 and max-entries to the desired +# max entires limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -2010,7 +1637,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2034,13 +1661,6 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # -# Note that it doesn't make sense to set the replica clients output buffer -# limit lower than the repl-backlog-size config (partial sync will succeed -# and then replica will get disconnected). -# Such a configuration is ignored (the size of repl-backlog-size will be used). -# This doesn't have memory consumption implications since the replica client -# will share the backlog buffers memory. -# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -2054,25 +1674,6 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb -# In some scenarios client connections can hog up memory leading to OOM -# errors or data eviction. To avoid this we can cap the accumulated memory -# used by all client connections (all pubsub and normal clients). Once we -# reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most -# memory first. We call this mechanism "client eviction". -# -# Client eviction is configured using the maxmemory-clients setting as follows: -# 0 - client eviction is disabled (default) -# -# A memory value can be used for the client eviction threshold, -# for example: -# maxmemory-clients 1g -# -# A percentage value (between 1% and 100%) means the client eviction threshold -# is based on a percentage of the maxmemory setting. For example to set client -# eviction at 5% of maxmemory: -# maxmemory-clients 5% - # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -2113,13 +1714,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -2216,7 +1817,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Active defragmentation is disabled by default +# Enabled active defragmentation # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis/docker-compose.yml b/dockge/redis/docker-compose.yml index fe930bde8..414c1b027 100644 --- a/dockge/redis/docker-compose.yml +++ b/dockge/redis/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:7.4.6-alpine + image: redis:6.2.20-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_6_2_20/.env b/dockge/redis_7_4_6/.env similarity index 100% rename from dockge/redis_6_2_20/.env rename to dockge/redis_7_4_6/.env diff --git a/dockge/redis_6_2_20/config/redis.conf b/dockge/redis_7_4_6/config/redis.conf similarity index 72% rename from dockge/redis_6_2_20/config/redis.conf rename to dockge/redis_7_4_6/config/redis.conf index ca22ec9f6..8795ae291 100644 --- a/dockge/redis_6_2_20/config/redis.conf +++ b/dockge/redis_7_4_6/config/redis.conf @@ -32,8 +32,17 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# # include /path/to/local.conf # include /path/to/other.conf +# include /path/to/fragments/*.conf +# ################################## MODULES ##################################### @@ -49,43 +58,81 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 -# bind 127.0.0.1 ::1 +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 loopback interface address (this means Redis will only be able to -# accept client connections from the same host that it is running on). +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# JUST COMMENT OUT THE FOLLOWING LINE. +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and if: -# -# 1) The server is not binding explicitly to a set of addresses using the -# "bind" directive. -# 2) No password is configured. -# -# The server only accepts connections from clients connecting from the -# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain -# sockets. +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured, nor a specific set of interfaces -# are explicitly listed using the "bind" directive. +# even if no authentication is configured. protected-mode yes +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -105,7 +152,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /tmp/redis.sock +# unixsocket /run/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -128,6 +175,16 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -143,8 +200,32 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. # # tls-dh-params-file redis.dh @@ -177,9 +258,12 @@ tcp-keepalive 300 # # tls-cluster yes -# Explicitly specify TLS versions to support. Allowed values are case insensitive -# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -221,6 +305,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -229,11 +314,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -244,6 +335,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -269,44 +363,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -338,6 +462,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -412,9 +551,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -463,7 +603,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -477,12 +617,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -491,19 +637,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -578,6 +728,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -633,7 +820,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -697,8 +884,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -706,10 +897,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -717,8 +909,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -737,6 +938,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -758,6 +967,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -787,8 +1030,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -877,14 +1136,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -901,6 +1158,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -994,6 +1259,13 @@ replica-lazy-flush no lazyfree-lazy-user-del no +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1032,7 +1304,7 @@ lazyfree-lazy-user-del no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1050,7 +1322,7 @@ lazyfree-lazy-user-del no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1071,6 +1343,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1089,14 +1374,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1136,7 +1450,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1189,34 +1503,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1240,6 +1589,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1298,12 +1652,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1318,7 +1681,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1328,7 +1691,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1343,8 +1706,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1354,16 +1763,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1376,7 +1790,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1424,10 +1839,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1449,9 +1878,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1474,71 +1905,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1553,7 +1926,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1581,8 +1954,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1604,7 +1977,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1637,7 +2010,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1661,6 +2034,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1674,6 +2054,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1714,13 +2113,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1817,7 +2216,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis_6_2_20/docker-compose.yml b/dockge/redis_7_4_6/docker-compose.yml similarity index 94% rename from dockge/redis_6_2_20/docker-compose.yml rename to dockge/redis_7_4_6/docker-compose.yml index 414c1b027..fe930bde8 100644 --- a/dockge/redis_6_2_20/docker-compose.yml +++ b/dockge/redis_7_4_6/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:6.2.20-alpine + image: redis:7.4.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_6_2_20/envs/default.env b/dockge/redis_7_4_6/envs/default.env similarity index 100% rename from dockge/redis_6_2_20/envs/default.env rename to dockge/redis_7_4_6/envs/default.env diff --git a/dockge/redis_6_2_20/envs/global.env b/dockge/redis_7_4_6/envs/global.env similarity index 100% rename from dockge/redis_6_2_20/envs/global.env rename to dockge/redis_7_4_6/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_main/.env b/dockge/stream-rec-backend_0_7_2/.env similarity index 100% rename from dockge/stream-rec-backend_main/.env rename to dockge/stream-rec-backend_0_7_2/.env diff --git a/dockge/stream-rec-backend_main/docker-compose.yml b/dockge/stream-rec-backend_0_7_2/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_main/docker-compose.yml rename to dockge/stream-rec-backend_0_7_2/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend_main/docker-compose.yml +++ b/dockge/stream-rec-backend_0_7_2/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_main/envs/default.env b/dockge/stream-rec-backend_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_main/envs/default.env rename to dockge/stream-rec-backend_0_7_2/envs/default.env diff --git a/dockge/stream-rec-backend_main/envs/global.env b/dockge/stream-rec-backend_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_main/envs/global.env rename to dockge/stream-rec-backend_0_7_2/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_main/.env b/dockge/stream-rec-frontend_0_7_2/.env similarity index 100% rename from dockge/stream-rec-frontend_main/.env rename to dockge/stream-rec-frontend_0_7_2/.env diff --git a/dockge/stream-rec-frontend_main/docker-compose.yml b/dockge/stream-rec-frontend_0_7_2/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_main/docker-compose.yml rename to dockge/stream-rec-frontend_0_7_2/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend_main/docker-compose.yml +++ b/dockge/stream-rec-frontend_0_7_2/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_main/envs/default.env b/dockge/stream-rec-frontend_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_main/envs/default.env rename to dockge/stream-rec-frontend_0_7_2/envs/default.env diff --git a/dockge/stream-rec-frontend_main/envs/global.env b/dockge/stream-rec-frontend_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_main/envs/global.env rename to dockge/stream-rec-frontend_0_7_2/envs/global.env diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 03a278089..8465b7136 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_dev/.env b/dockge/stream-rec_0_7_2/.env similarity index 100% rename from dockge/stream-rec_dev/.env rename to dockge/stream-rec_0_7_2/.env diff --git a/dockge/stream-rec_dev/docker-compose.yml b/dockge/stream-rec_0_7_2/docker-compose.yml similarity index 92% rename from dockge/stream-rec_dev/docker-compose.yml rename to dockge/stream-rec_0_7_2/docker-compose.yml index 8465b7136..03a278089 100644 --- a/dockge/stream-rec_dev/docker-compose.yml +++ b/dockge/stream-rec_0_7_2/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:dev + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:dev + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_dev/envs/default.env b/dockge/stream-rec_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec_dev/envs/default.env rename to dockge/stream-rec_0_7_2/envs/default.env diff --git a/dockge/stream-rec_dev/envs/global.env b/dockge/stream-rec_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec_dev/envs/global.env rename to dockge/stream-rec_0_7_2/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 32a291fcd..5fa74c158 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,3 +4,9 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= + +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false + diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env deleted file mode 100644 index 5fa74c158..000000000 --- a/dockge/uptime-kuma_1_23_16/.env +++ /dev/null @@ -1,12 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env new file mode 100644 index 000000000..32a291fcd --- /dev/null +++ b/dockge/uptime-kuma_2_0_0/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + diff --git a/dockge/uptime-kuma_1_23_16/docker-compose.yml b/dockge/uptime-kuma_2_0_0/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_1_23_16/docker-compose.yml rename to dockge/uptime-kuma_2_0_0/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma_1_23_16/docker-compose.yml +++ b/dockge/uptime-kuma_2_0_0/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/envs/default.env b/dockge/uptime-kuma_2_0_0/envs/default.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/default.env rename to dockge/uptime-kuma_2_0_0/envs/default.env diff --git a/dockge/uptime-kuma_1_23_16/envs/global.env b/dockge/uptime-kuma_2_0_0/envs/global.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/global.env rename to dockge/uptime-kuma_2_0_0/envs/global.env From ec34ef7288a12df240e3e823ccac6372f8ba224a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 01:31:21 +0000 Subject: [PATCH 195/262] Update ollama/ollama Docker tag to v0.12.6 --- apps/ollama/0.12.5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ollama/0.12.5/docker-compose.yml b/apps/ollama/0.12.5/docker-compose.yml index fd2eb9acd..2bb2c5c8b 100644 --- a/apps/ollama/0.12.5/docker-compose.yml +++ b/apps/ollama/0.12.5/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ollama: - image: ollama/ollama:0.12.5 + image: ollama/ollama:0.12.6 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From f747cfd3152f25d2993406cdbe336297c7636503 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 01:31:31 +0000 Subject: [PATCH 196/262] Update app version [skip ci] --- apps/ollama/{0.12.5 => 0.12.6}/data.yml | 0 apps/ollama/{0.12.5 => 0.12.6}/docker-compose.yml | 0 apps/ollama/{0.12.5 => 0.12.6}/envs/default.env | 0 apps/ollama/{0.12.5 => 0.12.6}/envs/global.env | 0 apps/ollama/{0.12.5 => 0.12.6}/scripts/init.sh | 0 apps/ollama/{0.12.5 => 0.12.6}/scripts/uninstall.sh | 0 apps/ollama/{0.12.5 => 0.12.6}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ollama/{0.12.5 => 0.12.6}/data.yml (100%) rename apps/ollama/{0.12.5 => 0.12.6}/docker-compose.yml (100%) rename apps/ollama/{0.12.5 => 0.12.6}/envs/default.env (100%) rename apps/ollama/{0.12.5 => 0.12.6}/envs/global.env (100%) rename apps/ollama/{0.12.5 => 0.12.6}/scripts/init.sh (100%) rename apps/ollama/{0.12.5 => 0.12.6}/scripts/uninstall.sh (100%) rename apps/ollama/{0.12.5 => 0.12.6}/scripts/upgrade.sh (100%) diff --git a/apps/ollama/0.12.5/data.yml b/apps/ollama/0.12.6/data.yml similarity index 100% rename from apps/ollama/0.12.5/data.yml rename to apps/ollama/0.12.6/data.yml diff --git a/apps/ollama/0.12.5/docker-compose.yml b/apps/ollama/0.12.6/docker-compose.yml similarity index 100% rename from apps/ollama/0.12.5/docker-compose.yml rename to apps/ollama/0.12.6/docker-compose.yml diff --git a/apps/ollama/0.12.5/envs/default.env b/apps/ollama/0.12.6/envs/default.env similarity index 100% rename from apps/ollama/0.12.5/envs/default.env rename to apps/ollama/0.12.6/envs/default.env diff --git a/apps/ollama/0.12.5/envs/global.env b/apps/ollama/0.12.6/envs/global.env similarity index 100% rename from apps/ollama/0.12.5/envs/global.env rename to apps/ollama/0.12.6/envs/global.env diff --git a/apps/ollama/0.12.5/scripts/init.sh b/apps/ollama/0.12.6/scripts/init.sh similarity index 100% rename from apps/ollama/0.12.5/scripts/init.sh rename to apps/ollama/0.12.6/scripts/init.sh diff --git a/apps/ollama/0.12.5/scripts/uninstall.sh b/apps/ollama/0.12.6/scripts/uninstall.sh similarity index 100% rename from apps/ollama/0.12.5/scripts/uninstall.sh rename to apps/ollama/0.12.6/scripts/uninstall.sh diff --git a/apps/ollama/0.12.5/scripts/upgrade.sh b/apps/ollama/0.12.6/scripts/upgrade.sh similarity index 100% rename from apps/ollama/0.12.5/scripts/upgrade.sh rename to apps/ollama/0.12.6/scripts/upgrade.sh From f49d2ded1ad6f61ece518ad63d67af0a25ef741e Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 17 Oct 2025 01:41:08 +0000 Subject: [PATCH 197/262] Processed apps directory via GitHub Actions --- appstore/ollama/{0.12.5 => 0.12.6}/.env | 0 appstore/ollama/{0.12.5 => 0.12.6}/data.yml | 0 .../{0.12.5 => 0.12.6}/docker-compose.yml | 2 +- .../{0.12.5 => 0.12.6}/envs/default.env | 0 .../ollama/{0.12.5 => 0.12.6}/envs/global.env | 0 .../ollama/{0.12.5 => 0.12.6}/scripts/init.sh | 0 .../{0.12.5 => 0.12.6}/scripts/uninstall.sh | 0 .../{0.12.5 => 0.12.6}/scripts/upgrade.sh | 0 dockge/affine/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-aria2/.env | 2 +- dockge/alist-aria2/docker-compose.yml | 6 +- .../.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-ffmpeg/.env | 2 +- dockge/alist-ffmpeg/docker-compose.yml | 6 +- .../{alist_3_45_0 => alist-ffmpeg_4_0_2}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist/.env | 2 +- dockge/alist/docker-compose.yml | 6 +- .../{alist-aria2_3_40_0 => alist_4_0_2}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/archivebox/docker-compose.yml | 24 +- .../.env | 0 .../docker-compose.yml | 24 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/baota/docker-compose.yml | 2 +- dockge/{baota_9_0 => baota_10_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../{baota_9_0 => baota_10_0}/envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/emby/docker-compose.yml | 2 +- dockge/{emby_4_9_2_4 => emby_4_8_11_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/homarr/.env | 2 +- dockge/homarr/docker-compose.yml | 2 +- dockge/{homarr_1_41_0 => homarr_0_16_0}/.env | 2 +- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/iyuu-plus/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/minio/.env | 5 +- dockge/minio/docker-compose.yml | 6 +- .../.env | 5 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/moontv/.env | 3 - dockge/moontv/docker-compose.yml | 2 +- dockge/{moontv_latest => moontv_4_3_0}/.env | 3 + .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql/config/my.cnf | 34 +- dockge/mysql/docker-compose.yml | 11 +- dockge/mysql_5_7_44/config/my.cnf | 42 - dockge/{mysql_5_7_44 => mysql_8_4_6}/.env | 0 dockge/mysql_8_4_6/config/my.cnf | 20 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/nacos/docker-compose.yml | 2 +- dockge/{nacos_2_4_3 => nacos_2_5_1}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 0 dockge/ollama/docker-compose.yml | 2 +- dockge/postgresql-postgis/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/qbittorrent/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/redis/config/redis.conf | 759 +++++++++++++----- dockge/redis/docker-compose.yml | 2 +- dockge/{redis_7_4_6 => redis_6_2_20}/.env | 0 .../config/redis.conf | 759 +++++------------- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-backend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-frontend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec/docker-compose.yml | 4 +- .../{stream-rec_0_7_2 => stream-rec_dev}/.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma/.env | 6 - dockge/uptime-kuma/docker-compose.yml | 11 +- dockge/uptime-kuma_1_23_16/.env | 12 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma_2_0_0/.env | 6 - 149 files changed, 947 insertions(+), 947 deletions(-) rename appstore/ollama/{0.12.5 => 0.12.6}/.env (100%) rename appstore/ollama/{0.12.5 => 0.12.6}/data.yml (100%) rename appstore/ollama/{0.12.5 => 0.12.6}/docker-compose.yml (95%) rename appstore/ollama/{0.12.5 => 0.12.6}/envs/default.env (100%) rename appstore/ollama/{0.12.5 => 0.12.6}/envs/global.env (100%) rename appstore/ollama/{0.12.5 => 0.12.6}/scripts/init.sh (100%) rename appstore/ollama/{0.12.5 => 0.12.6}/scripts/uninstall.sh (100%) rename appstore/ollama/{0.12.5 => 0.12.6}/scripts/upgrade.sh (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/.env (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/docker-compose.yml (94%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/envs/default.env (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/envs/global.env (100%) rename dockge/{alist-ffmpeg_3_45_0 => alist-aria2_4_0_2}/.env (93%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/docker-compose.yml (85%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/envs/default.env (100%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/envs/global.env (100%) rename dockge/{alist_3_45_0 => alist-ffmpeg_4_0_2}/.env (93%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/docker-compose.yml (85%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/envs/default.env (100%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/envs/global.env (100%) rename dockge/{alist-aria2_3_40_0 => alist_4_0_2}/.env (93%) rename dockge/{alist_3_45_0 => alist_4_0_2}/docker-compose.yml (86%) rename dockge/{alist_3_45_0 => alist_4_0_2}/envs/default.env (100%) rename dockge/{alist_3_45_0 => alist_4_0_2}/envs/global.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/docker-compose.yml (60%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/envs/default.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/envs/global.env (100%) rename dockge/{baota_9_0 => baota_10_0}/.env (100%) rename dockge/{baota_9_0 => baota_10_0}/docker-compose.yml (92%) rename dockge/{baota_9_0 => baota_10_0}/envs/default.env (100%) rename dockge/{baota_9_0 => baota_10_0}/envs/global.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/categories.json (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/template.html (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/docker-compose.yml (88%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/envs/default.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/envs/global.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/docker-compose.yml (95%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/envs/default.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/envs/global.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/docker-compose.yml (96%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/envs/default.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/envs/global.env (100%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/.env (67%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/docker-compose.yml (89%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/envs/default.env (100%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/envs/global.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/docker-compose.yml (95%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/envs/default.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/envs/global.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/.env (86%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/docker-compose.yml (83%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/envs/default.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/envs/global.env (100%) rename dockge/{moontv_latest => moontv_4_3_0}/.env (95%) rename dockge/{moontv_latest => moontv_4_3_0}/docker-compose.yml (87%) rename dockge/{moontv_latest => moontv_4_3_0}/envs/default.env (100%) rename dockge/{moontv_latest => moontv_4_3_0}/envs/global.env (100%) delete mode 100644 dockge/mysql_5_7_44/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_6}/.env (100%) create mode 100644 dockge/mysql_8_4_6/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_6}/docker-compose.yml (65%) rename dockge/{mysql_5_7_44 => mysql_8_4_6}/envs/default.env (100%) rename dockge/{mysql_5_7_44 => mysql_8_4_6}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/docker-compose.yml (94%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/envs/default.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/init/mysql-schema.sql (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/.env (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/docker-compose.yml (94%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/envs/default.env (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/envs/global.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/docker-compose.yml (89%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/envs/default.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/envs/global.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/docker-compose.yml (95%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/envs/default.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/envs/global.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/config/redis.conf (72%) rename dockge/{redis_7_4_6 => redis_6_2_20}/docker-compose.yml (94%) rename dockge/{redis_7_4_6 => redis_6_2_20}/envs/default.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/envs/global.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/docker-compose.yml (92%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/envs/default.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/envs/global.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/docker-compose.yml (87%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/envs/default.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/envs/global.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/docker-compose.yml (92%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/envs/default.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/envs/global.env (100%) create mode 100644 dockge/uptime-kuma_1_23_16/.env rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/docker-compose.yml (57%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/default.env (100%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/global.env (100%) delete mode 100644 dockge/uptime-kuma_2_0_0/.env diff --git a/appstore/ollama/0.12.5/.env b/appstore/ollama/0.12.6/.env similarity index 100% rename from appstore/ollama/0.12.5/.env rename to appstore/ollama/0.12.6/.env diff --git a/appstore/ollama/0.12.5/data.yml b/appstore/ollama/0.12.6/data.yml similarity index 100% rename from appstore/ollama/0.12.5/data.yml rename to appstore/ollama/0.12.6/data.yml diff --git a/appstore/ollama/0.12.5/docker-compose.yml b/appstore/ollama/0.12.6/docker-compose.yml similarity index 95% rename from appstore/ollama/0.12.5/docker-compose.yml rename to appstore/ollama/0.12.6/docker-compose.yml index 2ae64ca65..b74e0d900 100644 --- a/appstore/ollama/0.12.5/docker-compose.yml +++ b/appstore/ollama/0.12.6/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.12.5 + image: ollama/ollama:0.12.6 labels: createdBy: Apps networks: diff --git a/appstore/ollama/0.12.5/envs/default.env b/appstore/ollama/0.12.6/envs/default.env similarity index 100% rename from appstore/ollama/0.12.5/envs/default.env rename to appstore/ollama/0.12.6/envs/default.env diff --git a/appstore/ollama/0.12.5/envs/global.env b/appstore/ollama/0.12.6/envs/global.env similarity index 100% rename from appstore/ollama/0.12.5/envs/global.env rename to appstore/ollama/0.12.6/envs/global.env diff --git a/appstore/ollama/0.12.5/scripts/init.sh b/appstore/ollama/0.12.6/scripts/init.sh similarity index 100% rename from appstore/ollama/0.12.5/scripts/init.sh rename to appstore/ollama/0.12.6/scripts/init.sh diff --git a/appstore/ollama/0.12.5/scripts/uninstall.sh b/appstore/ollama/0.12.6/scripts/uninstall.sh similarity index 100% rename from appstore/ollama/0.12.5/scripts/uninstall.sh rename to appstore/ollama/0.12.6/scripts/uninstall.sh diff --git a/appstore/ollama/0.12.5/scripts/upgrade.sh b/appstore/ollama/0.12.6/scripts/upgrade.sh similarity index 100% rename from appstore/ollama/0.12.5/scripts/upgrade.sh rename to appstore/ollama/0.12.6/scripts/upgrade.sh diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/.env b/dockge/affine_stable-1623f5d/.env similarity index 100% rename from dockge/affine_stable-e98f035/.env rename to dockge/affine_stable-1623f5d/.env diff --git a/dockge/affine_stable-e98f035/docker-compose.yml b/dockge/affine_stable-1623f5d/docker-compose.yml similarity index 94% rename from dockge/affine_stable-e98f035/docker-compose.yml rename to dockge/affine_stable-1623f5d/docker-compose.yml index 94a383ee2..18926413f 100644 --- a/dockge/affine_stable-e98f035/docker-compose.yml +++ b/dockge/affine_stable-1623f5d/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/envs/default.env b/dockge/affine_stable-1623f5d/envs/default.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/default.env rename to dockge/affine_stable-1623f5d/envs/default.env diff --git a/dockge/affine_stable-e98f035/envs/global.env b/dockge/affine_stable-1623f5d/envs/global.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/global.env rename to dockge/affine_stable-1623f5d/envs/global.env diff --git a/dockge/alist-aria2/.env b/dockge/alist-aria2/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-aria2/.env +++ b/dockge/alist-aria2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index d11a2d481..a6913980a 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist-aria2: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-aria2 + image: qyg2297248353/alist-aria2:v3.40.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_3_45_0/.env b/dockge/alist-aria2_4_0_2/.env similarity index 93% rename from dockge/alist-ffmpeg_3_45_0/.env rename to dockge/alist-aria2_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg_3_45_0/.env +++ b/dockge/alist-aria2_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2_3_40_0/docker-compose.yml b/dockge/alist-aria2_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-aria2_3_40_0/docker-compose.yml rename to dockge/alist-aria2_4_0_2/docker-compose.yml index a6913980a..d11a2d481 100644 --- a/dockge/alist-aria2_3_40_0/docker-compose.yml +++ b/dockge/alist-aria2_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist-aria2: + openlist: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist-aria2:v3.40.0 + image: openlistteam/openlist:v4.0.2-aria2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_3_40_0/envs/default.env b/dockge/alist-aria2_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-aria2_3_40_0/envs/default.env rename to dockge/alist-aria2_4_0_2/envs/default.env diff --git a/dockge/alist-aria2_3_40_0/envs/global.env b/dockge/alist-aria2_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-aria2_3_40_0/envs/global.env rename to dockge/alist-aria2_4_0_2/envs/global.env diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index ded9a5b7e..37149a612 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_3_45_0/.env b/dockge/alist-ffmpeg_4_0_2/.env similarity index 93% rename from dockge/alist_3_45_0/.env rename to dockge/alist-ffmpeg_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist_3_45_0/.env +++ b/dockge/alist-ffmpeg_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_3_45_0/docker-compose.yml rename to dockge/alist-ffmpeg_4_0_2/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml +++ b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: openlistteam/openlist:v4.0.2-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_3_45_0/envs/default.env b/dockge/alist-ffmpeg_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/default.env rename to dockge/alist-ffmpeg_4_0_2/envs/default.env diff --git a/dockge/alist-ffmpeg_3_45_0/envs/global.env b/dockge/alist-ffmpeg_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/global.env rename to dockge/alist-ffmpeg_4_0_2/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_3_40_0/.env b/dockge/alist_4_0_2/.env similarity index 93% rename from dockge/alist-aria2_3_40_0/.env rename to dockge/alist_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-aria2_3_40_0/.env +++ b/dockge/alist_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist_3_45_0/docker-compose.yml b/dockge/alist_4_0_2/docker-compose.yml similarity index 86% rename from dockge/alist_3_45_0/docker-compose.yml rename to dockge/alist_4_0_2/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist_3_45_0/docker-compose.yml +++ b/dockge/alist_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: openlistteam/openlist:v4.0.2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_3_45_0/envs/default.env b/dockge/alist_4_0_2/envs/default.env similarity index 100% rename from dockge/alist_3_45_0/envs/default.env rename to dockge/alist_4_0_2/envs/default.env diff --git a/dockge/alist_3_45_0/envs/global.env b/dockge/alist_4_0_2/envs/global.env similarity index 100% rename from dockge/alist_3_45_0/envs/global.env rename to dockge/alist_4_0_2/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index f70ce3cc2..ac22205db 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: archivebox: container_name: archivebox + depends_on: + - archivebox-init env_file: - ./envs/global.env - .env @@ -14,7 +16,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.7.3 + image: archivebox/archivebox:0.8.5rc51 labels: createdBy: Apps networks: @@ -24,6 +26,26 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data + archivebox-init: + command: archivebox init + container_name: init-archivebox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - ALLOWED_HOSTS=* + - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - SEARCH_BACKEND_ENGINE=sonic + - SEARCH_BACKEND_HOST_NAME=archivebox-sonic + - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} + image: archivebox/archivebox:0.8.5rc51 + labels: + createdBy: Apps + networks: + - 1panel-network + volumes: + - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_8_5rc51/.env b/dockge/archivebox_0_7_3/.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/.env rename to dockge/archivebox_0_7_3/.env diff --git a/dockge/archivebox_0_8_5rc51/docker-compose.yml b/dockge/archivebox_0_7_3/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_8_5rc51/docker-compose.yml rename to dockge/archivebox_0_7_3/docker-compose.yml index ac22205db..f70ce3cc2 100644 --- a/dockge/archivebox_0_8_5rc51/docker-compose.yml +++ b/dockge/archivebox_0_7_3/docker-compose.yml @@ -4,8 +4,6 @@ networks: services: archivebox: container_name: archivebox - depends_on: - - archivebox-init env_file: - ./envs/global.env - .env @@ -16,7 +14,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 + image: archivebox/archivebox:0.7.3 labels: createdBy: Apps networks: @@ -26,26 +24,6 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data - archivebox-init: - command: archivebox init - container_name: init-archivebox - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - ALLOWED_HOSTS=* - - CSRF_TRUSTED_ORIGINS=http://localhost:8000 - - SEARCH_BACKEND_ENGINE=sonic - - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 - labels: - createdBy: Apps - networks: - - 1panel-network - volumes: - - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_8_5rc51/envs/default.env b/dockge/archivebox_0_7_3/envs/default.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/envs/default.env rename to dockge/archivebox_0_7_3/envs/default.env diff --git a/dockge/archivebox_0_8_5rc51/envs/global.env b/dockge/archivebox_0_7_3/envs/global.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/envs/global.env rename to dockge/archivebox_0_7_3/envs/global.env diff --git a/dockge/baota/docker-compose.yml b/dockge/baota/docker-compose.yml index 678152df3..c28254802 100644 --- a/dockge/baota/docker-compose.yml +++ b/dockge/baota/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:10.0_lts + image: btpanel/baota:9.0_lts_latest labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_9_0/.env b/dockge/baota_10_0/.env similarity index 100% rename from dockge/baota_9_0/.env rename to dockge/baota_10_0/.env diff --git a/dockge/baota_9_0/docker-compose.yml b/dockge/baota_10_0/docker-compose.yml similarity index 92% rename from dockge/baota_9_0/docker-compose.yml rename to dockge/baota_10_0/docker-compose.yml index c28254802..678152df3 100644 --- a/dockge/baota_9_0/docker-compose.yml +++ b/dockge/baota_10_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:9.0_lts_latest + image: btpanel/baota:10.0_lts labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_9_0/envs/default.env b/dockge/baota_10_0/envs/default.env similarity index 100% rename from dockge/baota_9_0/envs/default.env rename to dockge/baota_10_0/envs/default.env diff --git a/dockge/baota_9_0/envs/global.env b/dockge/baota_10_0/envs/global.env similarity index 100% rename from dockge/baota_9_0/envs/global.env rename to dockge/baota_10_0/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index af4782f89..c68c76b14 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.8 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.8 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/.env b/dockge/bili-fetcher_1_6_8/.env similarity index 100% rename from dockge/bili-fetcher_latest/.env rename to dockge/bili-fetcher_1_6_8/.env diff --git a/dockge/bili-fetcher_latest/config/categories.json b/dockge/bili-fetcher_1_6_8/config/categories.json similarity index 100% rename from dockge/bili-fetcher_latest/config/categories.json rename to dockge/bili-fetcher_1_6_8/config/categories.json diff --git a/dockge/bili-fetcher_latest/config/config.yaml b/dockge/bili-fetcher_1_6_8/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/config.yaml rename to dockge/bili-fetcher_1_6_8/config/config.yaml diff --git a/dockge/bili-fetcher_latest/config/scheduler_config.yaml b/dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/scheduler_config.yaml rename to dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_latest/config/sql_statements_mysql.py b/dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_mysql.py rename to dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py b/dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_latest/config/template.html b/dockge/bili-fetcher_1_6_8/config/template.html similarity index 100% rename from dockge/bili-fetcher_latest/config/template.html rename to dockge/bili-fetcher_1_6_8/config/template.html diff --git a/dockge/bili-fetcher_latest/docker-compose.yml b/dockge/bili-fetcher_1_6_8/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_latest/docker-compose.yml rename to dockge/bili-fetcher_1_6_8/docker-compose.yml index c68c76b14..af4782f89 100644 --- a/dockge/bili-fetcher_latest/docker-compose.yml +++ b/dockge/bili-fetcher_1_6_8/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/envs/default.env b/dockge/bili-fetcher_1_6_8/envs/default.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/default.env rename to dockge/bili-fetcher_1_6_8/envs/default.env diff --git a/dockge/bili-fetcher_latest/envs/global.env b/dockge/bili-fetcher_1_6_8/envs/global.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/global.env rename to dockge/bili-fetcher_1_6_8/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index d618229ca..095cf8284 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.5 + image: elasticsearch:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_5/.env b/dockge/elastic-elasticsearch_8_19_5/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/.env rename to dockge/elastic-elasticsearch_8_19_5/.env diff --git a/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml b/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_1_5/docker-compose.yml rename to dockge/elastic-elasticsearch_8_19_5/docker-compose.yml index 095cf8284..d618229ca 100644 --- a/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml +++ b/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.1.5 + image: elasticsearch:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_5/envs/default.env b/dockge/elastic-elasticsearch_8_19_5/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/envs/default.env rename to dockge/elastic-elasticsearch_8_19_5/envs/default.env diff --git a/dockge/elastic-elasticsearch_9_1_5/envs/global.env b/dockge/elastic-elasticsearch_8_19_5/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/envs/global.env rename to dockge/elastic-elasticsearch_8_19_5/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index c7d0828cd..1a784d0e3 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.19.5 + image: kibana:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_5/.env b/dockge/elastic-kibana_8_19_5/.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/.env rename to dockge/elastic-kibana_8_19_5/.env diff --git a/dockge/elastic-kibana_9_1_5/docker-compose.yml b/dockge/elastic-kibana_8_19_5/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_9_1_5/docker-compose.yml rename to dockge/elastic-kibana_8_19_5/docker-compose.yml index 1a784d0e3..c7d0828cd 100644 --- a/dockge/elastic-kibana_9_1_5/docker-compose.yml +++ b/dockge/elastic-kibana_8_19_5/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.1.5 + image: kibana:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_5/envs/default.env b/dockge/elastic-kibana_8_19_5/envs/default.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/envs/default.env rename to dockge/elastic-kibana_8_19_5/envs/default.env diff --git a/dockge/elastic-kibana_9_1_5/envs/global.env b/dockge/elastic-kibana_8_19_5/envs/global.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/envs/global.env rename to dockge/elastic-kibana_8_19_5/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index a461e63ac..1e9567477 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_4/.env b/dockge/emby_4_8_11_0/.env similarity index 100% rename from dockge/emby_4_9_2_4/.env rename to dockge/emby_4_8_11_0/.env diff --git a/dockge/emby_4_9_2_4/docker-compose.yml b/dockge/emby_4_8_11_0/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_2_4/docker-compose.yml rename to dockge/emby_4_8_11_0/docker-compose.yml index 1e9567477..a461e63ac 100644 --- a/dockge/emby_4_9_2_4/docker-compose.yml +++ b/dockge/emby_4_8_11_0/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_4/envs/default.env b/dockge/emby_4_8_11_0/envs/default.env similarity index 100% rename from dockge/emby_4_9_2_4/envs/default.env rename to dockge/emby_4_8_11_0/envs/default.env diff --git a/dockge/emby_4_9_2_4/envs/global.env b/dockge/emby_4_8_11_0/envs/global.env similarity index 100% rename from dockge/emby_4_9_2_4/envs/global.env rename to dockge/emby_4_8_11_0/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 8568f94b3..06b42b32c 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_41_0/.env b/dockge/homarr_0_16_0/.env similarity index 67% rename from dockge/homarr_1_41_0/.env rename to dockge/homarr_0_16_0/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr_1_41_0/.env +++ b/dockge/homarr_0_16_0/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr_1_41_0/docker-compose.yml b/dockge/homarr_0_16_0/docker-compose.yml similarity index 89% rename from dockge/homarr_1_41_0/docker-compose.yml rename to dockge/homarr_0_16_0/docker-compose.yml index 06b42b32c..8568f94b3 100644 --- a/dockge/homarr_1_41_0/docker-compose.yml +++ b/dockge/homarr_0_16_0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/ajnart/homarr:0.16.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_41_0/envs/default.env b/dockge/homarr_0_16_0/envs/default.env similarity index 100% rename from dockge/homarr_1_41_0/envs/default.env rename to dockge/homarr_0_16_0/envs/default.env diff --git a/dockge/homarr_1_41_0/envs/global.env b/dockge/homarr_0_16_0/envs/global.env similarity index 100% rename from dockge/homarr_1_41_0/envs/global.env rename to dockge/homarr_0_16_0/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus/docker-compose.yml +++ b/dockge/iyuu-plus/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus:latest + image: iyuucn/iyuuplus-nodb:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/.env b/dockge/iyuu-plus_latest-mysql/.env similarity index 100% rename from dockge/iyuu-plus_latest/.env rename to dockge/iyuu-plus_latest-mysql/.env diff --git a/dockge/iyuu-plus_latest/docker-compose.yml b/dockge/iyuu-plus_latest-mysql/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest/docker-compose.yml rename to dockge/iyuu-plus_latest-mysql/docker-compose.yml index 39b4c1ba0..142aaa4d5 100644 --- a/dockge/iyuu-plus_latest/docker-compose.yml +++ b/dockge/iyuu-plus_latest-mysql/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/envs/default.env b/dockge/iyuu-plus_latest-mysql/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/default.env rename to dockge/iyuu-plus_latest-mysql/envs/default.env diff --git a/dockge/iyuu-plus_latest/envs/global.env b/dockge/iyuu-plus_latest-mysql/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/global.env rename to dockge/iyuu-plus_latest-mysql/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.env @@ -4,12 +4,9 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 (映射内部端口) [必填] +# API 端口 [必填] PANEL_APP_PORT_API=9000 -# API 内部端口 [必填] -MINIO_API_PORT=9000 - # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/.env b/dockge/minio_2025-09-07/.env similarity index 86% rename from dockge/minio_2025-04-22/.env rename to dockge/minio_2025-09-07/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio_2025-04-22/.env +++ b/dockge/minio_2025-09-07/.env @@ -4,9 +4,12 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 [必填] +# API 端口 (映射内部端口) [必填] PANEL_APP_PORT_API=9000 +# API 内部端口 [必填] +MINIO_API_PORT=9000 + # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio_2025-04-22/docker-compose.yml b/dockge/minio_2025-09-07/docker-compose.yml similarity index 83% rename from dockge/minio_2025-04-22/docker-compose.yml rename to dockge/minio_2025-09-07/docker-compose.yml index 2bc78e830..4e37e835a 100644 --- a/dockge/minio_2025-04-22/docker-compose.yml +++ b/dockge/minio_2025-09-07/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-09-07T16-13-09Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/envs/default.env b/dockge/minio_2025-09-07/envs/default.env similarity index 100% rename from dockge/minio_2025-04-22/envs/default.env rename to dockge/minio_2025-09-07/envs/default.env diff --git a/dockge/minio_2025-04-22/envs/global.env b/dockge/minio_2025-09-07/envs/global.env similarity index 100% rename from dockge/minio_2025-04-22/envs/global.env rename to dockge/minio_2025-09-07/envs/global.env diff --git a/dockge/moontv/.env b/dockge/moontv/.env index c1e2d49fa..4f33d3980 100644 --- a/dockge/moontv/.env +++ b/dockge/moontv/.env @@ -4,9 +4,6 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 -# Authorization Code [必填] -AUTH_TOKEN= - # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv/docker-compose.yml b/dockge/moontv/docker-compose.yml index 399cbb8a3..eedce5001 100644 --- a/dockge/moontv/docker-compose.yml +++ b/dockge/moontv/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:4.3.0 + image: ghcr.io/moontechlab/lunatv:latest labels: createdBy: Apps networks: diff --git a/dockge/moontv_latest/.env b/dockge/moontv_4_3_0/.env similarity index 95% rename from dockge/moontv_latest/.env rename to dockge/moontv_4_3_0/.env index 4f33d3980..c1e2d49fa 100644 --- a/dockge/moontv_latest/.env +++ b/dockge/moontv_4_3_0/.env @@ -4,6 +4,9 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 +# Authorization Code [必填] +AUTH_TOKEN= + # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv_latest/docker-compose.yml b/dockge/moontv_4_3_0/docker-compose.yml similarity index 87% rename from dockge/moontv_latest/docker-compose.yml rename to dockge/moontv_4_3_0/docker-compose.yml index eedce5001..399cbb8a3 100644 --- a/dockge/moontv_latest/docker-compose.yml +++ b/dockge/moontv_4_3_0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:latest + image: ghcr.io/moontechlab/lunatv:4.3.0 labels: createdBy: Apps networks: diff --git a/dockge/moontv_latest/envs/default.env b/dockge/moontv_4_3_0/envs/default.env similarity index 100% rename from dockge/moontv_latest/envs/default.env rename to dockge/moontv_4_3_0/envs/default.env diff --git a/dockge/moontv_latest/envs/global.env b/dockge/moontv_4_3_0/envs/global.env similarity index 100% rename from dockge/moontv_latest/envs/global.env rename to dockge/moontv_4_3_0/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index c53ca32dc..6d6e1a932 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,20 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + [mysqld] -host_cache_size=0 +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files user=mysql -mysql_native_password=ON +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 -log_bin_trust_function_creators=1 -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index ba5d56398..5cac14f48 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.6 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf deleted file mode 100644 index 6d6e1a932..000000000 --- a/dockge/mysql_5_7_44/config/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files -user=mysql - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M -character_set_server=utf8mb4 -lower_case_table_names=1 -group_concat_max_len=1024000 - -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_5_7_44/.env b/dockge/mysql_8_4_6/.env similarity index 100% rename from dockge/mysql_5_7_44/.env rename to dockge/mysql_8_4_6/.env diff --git a/dockge/mysql_8_4_6/config/my.cnf b/dockge/mysql_8_4_6/config/my.cnf new file mode 100644 index 000000000..c53ca32dc --- /dev/null +++ b/dockge/mysql_8_4_6/config/my.cnf @@ -0,0 +1,20 @@ +[mysqld] +host_cache_size=0 +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +user=mysql + +mysql_native_password=ON +character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci +lower_case_table_names=1 +group_concat_max_len=1024000 +log_bin_trust_function_creators=1 + +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ diff --git a/dockge/mysql_5_7_44/docker-compose.yml b/dockge/mysql_8_4_6/docker-compose.yml similarity index 65% rename from dockge/mysql_5_7_44/docker-compose.yml rename to dockge/mysql_8_4_6/docker-compose.yml index 5cac14f48..ba5d56398 100644 --- a/dockge/mysql_5_7_44/docker-compose.yml +++ b/dockge/mysql_8_4_6/docker-compose.yml @@ -5,14 +5,13 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --lower_case_table_names=1 - - --collation-server=utf8mb4_general_ci - - --explicit_defaults_for_timestamp=true + - --collation-server=utf8mb4_unicode_ci + - --mysql-native-password=ON container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:5.7.44 + image: mysql:8.4.6 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/envs/default.env b/dockge/mysql_8_4_6/envs/default.env similarity index 100% rename from dockge/mysql_5_7_44/envs/default.env rename to dockge/mysql_8_4_6/envs/default.env diff --git a/dockge/mysql_5_7_44/envs/global.env b/dockge/mysql_8_4_6/envs/global.env similarity index 100% rename from dockge/mysql_5_7_44/envs/global.env rename to dockge/mysql_8_4_6/envs/global.env diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 7e925e038..cf220b000 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/.env b/dockge/nacos_2_5_1/.env similarity index 100% rename from dockge/nacos_2_4_3/.env rename to dockge/nacos_2_5_1/.env diff --git a/dockge/nacos_2_4_3/docker-compose.yml b/dockge/nacos_2_5_1/docker-compose.yml similarity index 94% rename from dockge/nacos_2_4_3/docker-compose.yml rename to dockge/nacos_2_5_1/docker-compose.yml index cf220b000..7e925e038 100644 --- a/dockge/nacos_2_4_3/docker-compose.yml +++ b/dockge/nacos_2_5_1/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/envs/default.env b/dockge/nacos_2_5_1/envs/default.env similarity index 100% rename from dockge/nacos_2_4_3/envs/default.env rename to dockge/nacos_2_5_1/envs/default.env diff --git a/dockge/nacos_2_4_3/envs/global.env b/dockge/nacos_2_5_1/envs/global.env similarity index 100% rename from dockge/nacos_2_4_3/envs/global.env rename to dockge/nacos_2_5_1/envs/global.env diff --git a/dockge/nacos_2_4_3/init/mysql-schema.sql b/dockge/nacos_2_5_1/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_2_4_3/init/mysql-schema.sql rename to dockge/nacos_2_5_1/init/mysql-schema.sql diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml index 2ae64ca65..b74e0d900 100644 --- a/dockge/ollama/docker-compose.yml +++ b/dockge/ollama/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.12.5 + image: ollama/ollama:0.12.6 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis/docker-compose.yml b/dockge/postgresql-postgis/docker-compose.yml index a2cced821..eded4fd3c 100644 --- a/dockge/postgresql-postgis/docker-compose.yml +++ b/dockge/postgresql-postgis/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:17-3.5 + image: postgis/postgis:16-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_16-3_5/.env b/dockge/postgresql-postgis_17-3_5/.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/.env rename to dockge/postgresql-postgis_17-3_5/.env diff --git a/dockge/postgresql-postgis_16-3_5/docker-compose.yml b/dockge/postgresql-postgis_17-3_5/docker-compose.yml similarity index 94% rename from dockge/postgresql-postgis_16-3_5/docker-compose.yml rename to dockge/postgresql-postgis_17-3_5/docker-compose.yml index eded4fd3c..a2cced821 100644 --- a/dockge/postgresql-postgis_16-3_5/docker-compose.yml +++ b/dockge/postgresql-postgis_17-3_5/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:16-3.5 + image: postgis/postgis:17-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_16-3_5/envs/default.env b/dockge/postgresql-postgis_17-3_5/envs/default.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/envs/default.env rename to dockge/postgresql-postgis_17-3_5/envs/default.env diff --git a/dockge/postgresql-postgis_16-3_5/envs/global.env b/dockge/postgresql-postgis_17-3_5/envs/global.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/envs/global.env rename to dockge/postgresql-postgis_17-3_5/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 9724e766c..e8ef19ae8 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:14 + image: postgres:17.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_6-alpine/.env b/dockge/postgresql_pg14/.env similarity index 100% rename from dockge/postgresql_17_6-alpine/.env rename to dockge/postgresql_pg14/.env diff --git a/dockge/postgresql_17_6-alpine/docker-compose.yml b/dockge/postgresql_pg14/docker-compose.yml similarity index 89% rename from dockge/postgresql_17_6-alpine/docker-compose.yml rename to dockge/postgresql_pg14/docker-compose.yml index e8ef19ae8..9724e766c 100644 --- a/dockge/postgresql_17_6-alpine/docker-compose.yml +++ b/dockge/postgresql_pg14/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg14-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:17.6-alpine + image: postgres:14 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_6-alpine/envs/default.env b/dockge/postgresql_pg14/envs/default.env similarity index 100% rename from dockge/postgresql_17_6-alpine/envs/default.env rename to dockge/postgresql_pg14/envs/default.env diff --git a/dockge/postgresql_17_6-alpine/envs/global.env b/dockge/postgresql_pg14/envs/global.env similarity index 100% rename from dockge/postgresql_17_6-alpine/envs/global.env rename to dockge/postgresql_pg14/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 116044519..5ec4b458b 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/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.1.2 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/.env b/dockge/qbittorrent_5_1_2/.env similarity index 100% rename from dockge/qbittorrent_4_6_7/.env rename to dockge/qbittorrent_5_1_2/.env diff --git a/dockge/qbittorrent_4_6_7/docker-compose.yml b/dockge/qbittorrent_5_1_2/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_4_6_7/docker-compose.yml rename to dockge/qbittorrent_5_1_2/docker-compose.yml index 5ec4b458b..116044519 100644 --- a/dockge/qbittorrent_4_6_7/docker-compose.yml +++ b/dockge/qbittorrent_5_1_2/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:4.6.7 + image: linuxserver/qbittorrent:5.1.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/envs/default.env b/dockge/qbittorrent_5_1_2/envs/default.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/default.env rename to dockge/qbittorrent_5_1_2/envs/default.env diff --git a/dockge/qbittorrent_4_6_7/envs/global.env b/dockge/qbittorrent_5_1_2/envs/global.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/global.env rename to dockge/qbittorrent_5_1_2/envs/global.env diff --git a/dockge/redis/config/redis.conf b/dockge/redis/config/redis.conf index ca22ec9f6..8795ae291 100644 --- a/dockge/redis/config/redis.conf +++ b/dockge/redis/config/redis.conf @@ -32,8 +32,17 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# # include /path/to/local.conf # include /path/to/other.conf +# include /path/to/fragments/*.conf +# ################################## MODULES ##################################### @@ -49,43 +58,81 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 -# bind 127.0.0.1 ::1 +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 loopback interface address (this means Redis will only be able to -# accept client connections from the same host that it is running on). +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# JUST COMMENT OUT THE FOLLOWING LINE. +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and if: -# -# 1) The server is not binding explicitly to a set of addresses using the -# "bind" directive. -# 2) No password is configured. -# -# The server only accepts connections from clients connecting from the -# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain -# sockets. +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured, nor a specific set of interfaces -# are explicitly listed using the "bind" directive. +# even if no authentication is configured. protected-mode yes +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -105,7 +152,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /tmp/redis.sock +# unixsocket /run/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -128,6 +175,16 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -143,8 +200,32 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. # # tls-dh-params-file redis.dh @@ -177,9 +258,12 @@ tcp-keepalive 300 # # tls-cluster yes -# Explicitly specify TLS versions to support. Allowed values are case insensitive -# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -221,6 +305,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -229,11 +314,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -244,6 +335,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -269,44 +363,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -338,6 +462,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -412,9 +551,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -463,7 +603,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -477,12 +617,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -491,19 +637,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -578,6 +728,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -633,7 +820,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -697,8 +884,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -706,10 +897,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -717,8 +909,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -737,6 +938,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -758,6 +967,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -787,8 +1030,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -877,14 +1136,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -901,6 +1158,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -994,6 +1259,13 @@ replica-lazy-flush no lazyfree-lazy-user-del no +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1032,7 +1304,7 @@ lazyfree-lazy-user-del no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1050,7 +1322,7 @@ lazyfree-lazy-user-del no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1071,6 +1343,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1089,14 +1374,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1136,7 +1450,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1189,34 +1503,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1240,6 +1589,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1298,12 +1652,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1318,7 +1681,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1328,7 +1691,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1343,8 +1706,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1354,16 +1763,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1376,7 +1790,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1424,10 +1839,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1449,9 +1878,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1474,71 +1905,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1553,7 +1926,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1581,8 +1954,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1604,7 +1977,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1637,7 +2010,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1661,6 +2034,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1674,6 +2054,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1714,13 +2113,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1817,7 +2216,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis/docker-compose.yml b/dockge/redis/docker-compose.yml index 414c1b027..fe930bde8 100644 --- a/dockge/redis/docker-compose.yml +++ b/dockge/redis/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:6.2.20-alpine + image: redis:7.4.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_7_4_6/.env b/dockge/redis_6_2_20/.env similarity index 100% rename from dockge/redis_7_4_6/.env rename to dockge/redis_6_2_20/.env diff --git a/dockge/redis_7_4_6/config/redis.conf b/dockge/redis_6_2_20/config/redis.conf similarity index 72% rename from dockge/redis_7_4_6/config/redis.conf rename to dockge/redis_6_2_20/config/redis.conf index 8795ae291..ca22ec9f6 100644 --- a/dockge/redis_7_4_6/config/redis.conf +++ b/dockge/redis_6_2_20/config/redis.conf @@ -32,17 +32,8 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # -# Included paths may contain wildcards. All files matching the wildcards will -# be included in alphabetical order. -# Note that if an include path contains a wildcards but no files match it when -# the server is started, the include statement will be ignored and no error will -# be emitted. It is safe, therefore, to include wildcard files from empty -# directories. -# # include /path/to/local.conf # include /path/to/other.conf -# include /path/to/fragments/*.conf -# ################################## MODULES ##################################### @@ -58,81 +49,43 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. -# Each address can be prefixed by "-", which means that redis will not fail to -# start if the address is not available. Being not available only refers to -# addresses that does not correspond to any network interface. Addresses that -# are already in use will always fail, and unsupported protocols will always BE -# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses -# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 -# bind * -::* # like the default, all available interfaces +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis -# will only be able to accept client connections from the same host that it is -# running on). +# IPv4 loopback interface address (this means Redis will only be able to +# accept client connections from the same host that it is running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# COMMENT OUT THE FOLLOWING LINE. -# -# You will also need to set a password unless you explicitly disable protected -# mode. +# JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 -# By default, outgoing connections (from replica to master, from Sentinel to -# instances, cluster bus, etc.) are not bound to a specific local address. In -# most cases, this means the operating system will handle that based on routing -# and the interface through which the connection goes out. -# -# Using bind-source-addr it is possible to configure a specific address to bind -# to, which may also affect how the connection gets routed. -# -# Example: -# -# bind-source-addr 10.0.0.1 - # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and the default user has no password, the server -# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address -# (::1) or Unix domain sockets. +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured. +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. protected-mode yes -# Redis uses default hardened security configuration directives to reduce the -# attack surface on innocent users. Therefore, several sensitive configuration -# directives are immutable, and some potentially-dangerous commands are blocked. -# -# Configuration directives that control files that Redis writes to (e.g., 'dir' -# and 'dbfilename') and that aren't usually modified during runtime -# are protected by making them immutable. -# -# Commands that can increase the attack surface of Redis and that aren't usually -# called by users are blocked by default. -# -# These can be exposed to either all connections or just local ones by setting -# each of the configs listed below to either of these values: -# -# no - Block for any connection (remain immutable) -# yes - Allow for any connection (no protection) -# local - Allow only for local connections. Ones originating from the -# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. -# -# enable-protected-configs no -# enable-debug-command no -# enable-module-command no - # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -152,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /run/redis.sock +# unixsocket /tmp/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -175,16 +128,6 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 -# Apply OS-specific mechanism to mark the listening socket with the specified -# ID, to support advanced routing and filtering capabilities. -# -# On Linux, the ID represents a connection mark. -# On FreeBSD, the ID represents a socket cookie ID. -# On OpenBSD, the ID represents a route table ID. -# -# The default value is 0, which implies no marking is required. -# socket-mark-id 0 - ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -200,32 +143,8 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-key-file-pass secret -# Normally Redis uses the same certificate for both server functions (accepting -# connections) and client functions (replicating from a master, establishing -# cluster bus connections, etc.). -# -# Sometimes certificates are issued with attributes that designate them as -# client-only or server-only certificates. In that case it may be desired to use -# different certificates for incoming (server) and outgoing (client) -# connections. To do that, use the following directives: -# -# tls-client-cert-file client.crt -# tls-client-key-file client.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-client-key-file-pass secret - -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, -# required by older versions of OpenSSL (<3.0). Newer versions do not require -# this configuration and recommend against it. +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # # tls-dh-params-file redis.dh @@ -258,12 +177,9 @@ tcp-keepalive 300 # # tls-cluster yes -# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended -# that older formally deprecated versions are kept disabled to reduce the attack surface. -# You can explicitly specify TLS versions to support. -# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", -# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. -# To enable only TLSv1.2 and TLSv1.3, use: +# Explicitly specify TLS versions to support. Allowed values are case insensitive +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or +# any combination. To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -305,7 +221,6 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -314,17 +229,11 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET -# on startup, and updating Redis status on a regular -# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -# -# The default is "no". To run under upstart/systemd, you can simply uncomment -# the line below: -# -# supervised auto +supervised no # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -335,9 +244,6 @@ daemonize no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -# -# Note that on modern Linux systems "/run/redis.pid" is more conforming -# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -363,74 +269,44 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 -# To disable the built in crash log, which will possibly produce cleaner core -# dumps when they are needed, uncomment the following: -# -# crash-log-enabled no - -# To disable the fast memory check that's run as part of the crash log, which -# will possibly let redis terminate sooner, uncomment the following: -# -# crash-memcheck-enabled no - # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY and syslog logging is -# disabled. Basically this means that normally a logo is displayed only in -# interactive sessions. +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo no - -# By default, Redis modifies the process title (as seen in 'top' and 'ps') to -# provide some runtime information. It is possible to disable this and leave -# the process name as executed by setting the following to no. -set-proc-title yes - -# When changing the process title, Redis uses the following template to construct -# the modified title. -# -# Template variables are specified in curly brackets. The following variables are -# supported: -# -# {title} Name of process as executed if parent, or type of child process. -# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or -# Unix socket if only that's available. -# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". -# {port} TCP port listening on, or 0. -# {tls-port} TLS port listening on, or 0. -# {unixsocket} Unix domain socket listening on, or "". -# {config-file} Name of configuration file used. -# -proc-title-template "{title} {listen-addr} {server-mode}" +always-show-logo yes ################################ SNAPSHOTTING ################################ +# +# Save the DB on disk: +# +# save +# +# Will save the DB if both the given number of seconds and the given +# number of write operations against the DB occurred. +# +# In the example below the behavior will be to save: +# after 900 sec (15 min) if at least 1 key changed +# after 300 sec (5 min) if at least 10 keys changed +# after 60 sec if at least 10000 keys changed +# +# Note: you can disable saving completely by commenting out all "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" -# Save the DB to disk. -# -# save [ ...] -# -# Redis will save the DB if the given number of seconds elapsed and it -# surpassed the given number of write operations against the DB. -# -# Snapshotting can be completely disabled with a single empty string argument -# as in following example: -# -# save "" -# -# Unless specified otherwise, by default Redis will save the DB: -# * After 3600 seconds (an hour) if at least 1 change was performed -# * After 300 seconds (5 minutes) if at least 100 changes were performed -# * After 60 seconds if at least 10000 changes were performed -# -# You can set these explicitly by uncommenting the following line. -# -# save 3600 1 300 100 60 10000 +save 900 1 +save 300 10 +save 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -462,21 +338,6 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes -# Enables or disables full sanitization checks for ziplist and listpack etc when -# loading an RDB or RESTORE payload. This reduces the chances of a assertion or -# crash later on while processing commands. -# Options: -# no - Never perform full sanitization -# yes - Always perform full sanitization -# clients - Perform full sanitization only for user connections. -# Excludes: RDB files, RESTORE commands received from the master -# connection, and client connections which have the -# skip-sanitize-payload ACL flag. -# The default should be 'clients' but since it currently affects cluster -# resharding via MIGRATE, it is temporarily set to 'no' by default. -# -# sanitize-dump-payload no - # The filename where to dump the DB dbfilename dump.rdb @@ -551,10 +412,9 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error -# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" -# to all data access commands, excluding commands such as: -# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with +# an error "SYNC with master in progress" to all commands except: +# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -603,7 +463,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync yes +repl-diskless-sync no # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -617,18 +477,12 @@ repl-diskless-sync yes # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# When diskless replication is enabled with a delay, it is possible to let -# the replication start before the maximum delay is reached if the maximum -# number of replicas expected have connected. Default of 0 means that the -# maximum is not defined and Redis will wait the full delay. -repl-diskless-sync-max-replicas 0 - # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if you know what you are doing. +# stage with the master. Use only if your do what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -637,23 +491,19 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and replica buffers). +# Copy on Write memory and salve buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep current db contents in RAM while parsing the data directly -# from the socket. Replicas in this mode can keep serving current -# data set while replication is in progress, except for cases where -# they can't recognize master as having a data set from same -# replication history. -# Note that this requires sufficient memory, if you don't have it, -# you risk an OOM kill. +# "swapdb" - Keep a copy of the current db contents in RAM while parsing +# the data directly from the socket. note that this requires +# sufficient memory, if you don't have it, you risk an OOM kill. repl-diskless-load disabled -# Master send PINGs to its replicas in a predefined interval. It's possible to +# Replicas send PINGs to server in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -728,43 +578,6 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 -# The propagation error behavior controls how Redis will behave when it is -# unable to handle a command being processed in the replication stream from a master -# or processed while reading from an AOF file. Errors that occur during propagation -# are unexpected, and can cause data inconsistency. However, there are edge cases -# in earlier versions of Redis where it was possible for the server to replicate or persist -# commands that would fail on future versions. For this reason the default behavior -# is to ignore such errors and continue processing commands. -# -# If an application wants to ensure there is no data divergence, this configuration -# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' -# to only panic when a replica encounters an error on the replication stream. One of -# these two panic values will become the default value in the future once there are -# sufficient safety mechanisms in place to prevent false positive crashes. -# -# propagation-error-behavior ignore - -# Replica ignore disk write errors controls the behavior of a replica when it is -# unable to persist a write command received from its master to disk. By default, -# this configuration is set to 'no' and will crash the replica in this condition. -# It is not recommended to change this default, however in order to be compatible -# with older versions of Redis this config can be toggled to 'yes' which will just -# log a warning and execute the write command it got from the master. -# -# replica-ignore-disk-write-errors no - -# ----------------------------------------------------------------------------- -# By default, Redis Sentinel includes all replicas in its reports. A replica -# can be excluded from Redis Sentinel's announcements. An unannounced replica -# will be ignored by the 'sentinel replicas ' command and won't be -# exposed to Redis Sentinel's clients. -# -# This option does not change the behavior of replica-priority. Even with -# replica-announced set to 'no', the replica can be promoted to master. To -# prevent this behavior, set replica-priority to 0. -# -# replica-announced yes - # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -820,7 +633,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# a radix key indexed by key name, what clients have which keys. In turn +# 16 millions of slots, what clients may have certain subsets of keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -884,12 +697,8 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. -# sanitize-payload RESTORE dump-payload is sanitized (default). -# + Allow the execution of that command. -# May be used with `|` for allowing subcommands (e.g "+config|get") -# - Disallow the execution of that command. -# May be used with `|` for blocking subcommands (e.g "-config|set") +# + Allow the execution of that command +# - Disallow the execution of that command # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -897,11 +706,10 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|first-arg Allow a specific first argument of an otherwise -# disabled command. It is only supported on commands with -# no sub-commands, and is not allowed as negative form -# like -SELECT|1, only additive starting with "+". This -# feature is deprecated and may be removed in the future. +# +|subcommand Allow a specific subcommand of an otherwise +# disabled command. Note that this form is not +# allowed as negative like -DEBUG|SEGFAULT, but +# only additive starting with "+". # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -909,17 +717,8 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read -# from. -# %W~ Add key write pattern that specifies which keys can be -# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. -# & Add a glob-style pattern of Pub/Sub channels that can be -# accessed by the user. It is possible to specify multiple channel -# patterns. -# allchannels Alias for &* -# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -938,14 +737,6 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. -# () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last -# character must be ). -# clearselectors Remove all of the currently attached selectors. -# Note this does not change the "root" user permissions, -# which are the permissions directly applied onto the -# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -967,40 +758,6 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # -# The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata -# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, -# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, -# key or metadata will also have `write` category. Commands that only read -# the keyspace, key or metadata will have the `read` category. -# * read - Reading from keys (values or metadata). Note that commands that don't -# interact with keys, will not have either `read` or `write`. -# * write - Writing to keys (values or metadata) -# * admin - Administrative commands. Normal applications will never need to use -# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. -# * dangerous - Potentially dangerous (each should be considered with care for -# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, -# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. -# * connection - Commands affecting the connection or other connections. -# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. -# * blocking - Potentially blocking the connection until released by another -# command. -# * fast - Fast O(1) commands. May loop on the number of arguments, but not the -# number of elements in the key. -# * slow - All commands that are not Fast. -# * pubsub - PUBLISH / SUBSCRIBE related -# * transaction - WATCH / MULTI / EXEC related commands. -# * scripting - Scripting related. -# * set - Data type: sets related. -# * sortedset - Data type: zsets related. -# * list - Data type: lists related. -# * hash - Data type: hashes related. -# * string - Data type: strings related. -# * bitmap - Data type: bitmaps related. -# * hyperloglog - Data type: hyperloglog related. -# * geo - Data type: geo related. -# * stream - Data type: streams related. -# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -1030,24 +787,8 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# The requirepass is not compatible with aclfile option and the ACL LOAD -# command, these will cause requirepass to be ignored. -# # requirepass foobared -# New users are initialized with restrictive permissions by default, via the -# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it -# is possible to manage access to Pub/Sub channels with ACL rules as well. The -# default Pub/Sub channels permission if new users is controlled by the -# acl-pubsub-default configuration directive, which accepts one of these values: -# -# allchannels: grants access to all Pub/Sub channels -# resetchannels: revokes access to all Pub/Sub channels -# -# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. -# -# acl-pubsub-default resetchannels - # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -1136,12 +877,14 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, when there are no suitable keys for -# eviction, Redis will return an error on write operations that require -# more memory. These are usually commands that create new keys, add data or -# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, -# SORT (due to the STORE argument), and EXEC (if the transaction includes any -# command that requires memory). +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append +# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd +# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby +# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby +# getset mset msetnx exec sort # # The default is: # @@ -1158,14 +901,6 @@ acllog-max-len 128 # # maxmemory-samples 5 -# Eviction processing is designed to function well with the default setting. -# If there is an unusually large amount of write traffic, this value may need to -# be increased. Decreasing this value may reduce latency at the risk of -# eviction processing effectiveness -# 0 = minimum latency, 10 = default, 100 = process without regard to latency -# -# maxmemory-eviction-tenacity 10 - # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -1259,13 +994,6 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous -# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the -# commands. When neither flag is passed, this directive will be used to determine -# if the data should be deleted asynchronously. - -lazyfree-lazy-user-flush no - ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1304,7 +1032,7 @@ lazyfree-lazy-user-flush no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Also, this feature currently does not work when SSL is +# CONFIG SET. Aso this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1322,7 +1050,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports these options: +# Redis supports three options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1343,19 +1071,6 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 - -#################### KERNEL transparent hugepage CONTROL ###################### - -# Usually the kernel Transparent Huge Pages control is set to "madvise" or -# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which -# case this config has no effect. On systems in which it is set to "always", -# redis will attempt to disable it specifically for the redis process in order -# to avoid latency problems specifically with fork(2) and CoW. -# If for some reason you prefer to keep it enabled, you can set this config to -# "no" and the kernel global to "always". - -disable-thp yes - ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1374,43 +1089,14 @@ disable-thp yes # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check https://redis.io/topics/persistence for more information. +# Please check http://redis.io/topics/persistence for more information. appendonly no -# The base name of the append only file. -# -# Redis 7 and newer use a set of append-only files to persist the dataset -# and changes applied to it. There are two basic types of files in use: -# -# - Base files, which are a snapshot representing the complete state of the -# dataset at the time the file was created. Base files can be either in -# the form of RDB (binary serialized) or AOF (textual commands). -# - Incremental files, which contain additional commands that were applied -# to the dataset following the previous file. -# -# In addition, manifest files are used to track the files and the order in -# which they were created and should be applied. -# -# Append-only file names are created by Redis following a specific pattern. -# The file name's prefix is based on the 'appendfilename' configuration -# parameter, followed by additional information about the sequence and type. -# -# For example, if appendfilename is set to appendonly.aof, the following file -# names could be derived: -# -# - appendonly.aof.1.base.rdb as a base file. -# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. -# - appendonly.aof.manifest as a manifest file. +# The name of the append only file (default: "appendonly.aof") appendfilename "appendonly.aof" -# For convenience, Redis stores all persistent append-only files in a dedicated -# directory. The name of the directory is determined by the appenddirname -# configuration parameter. - -appenddirname "appendonlydir" - # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1450,7 +1136,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync no". In practical terms, this means that it is +# the same as "appendfsync none". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1503,69 +1189,34 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# Redis can create append-only base files in either RDB or AOF formats. Using -# the RDB format is always faster and more efficient, and disabling it is only -# supported for backward compatibility purposes. +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading, Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, then continues loading the AOF +# tail. aof-use-rdb-preamble yes -# Redis supports recording timestamp annotations in the AOF to support restoring -# the data from a specific point-in-time. However, using this capability changes -# the AOF format in a way that may not be compatible with existing AOF parsers. -aof-timestamp-enabled no +################################ LUA SCRIPTING ############################### -################################ SHUTDOWN ##################################### - -# Maximum time to wait for replicas when shutting down, in seconds. +# Max execution time of a Lua script in milliseconds. # -# During shut down, a grace period allows any lagging replicas to catch up with -# the latest replication offset before the master exists. This period can -# prevent data loss, especially for deployments without configured disk backups. +# If the maximum execution time is reached Redis will log that a script is +# still in execution after the maximum allowed time and will start to +# reply to queries with an error. # -# The 'shutdown-timeout' value is the grace period's duration in seconds. It is -# only applicable when the instance has replicas. To disable the feature, set -# the value to 0. +# When a long running script exceeds the maximum execution time only the +# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be +# used to stop a script that did not yet call any write commands. The second +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural +# termination of the script. # -# shutdown-timeout 10 - -# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default -# an RDB snapshot is written to disk in a blocking operation if save points are configured. -# The options used on signaled shutdown can include the following values: -# default: Saves RDB snapshot only if save points are configured. -# Waits for lagging replicas to catch up. -# save: Forces a DB saving operation even if no save points are configured. -# nosave: Prevents DB saving operation even if one or more save points are configured. -# now: Skips waiting for lagging replicas. -# force: Ignores any errors that would normally prevent the server from exiting. -# -# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. -# Example: "nosave force now" -# -# shutdown-on-sigint default -# shutdown-on-sigterm default - -################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### - -# Maximum time in milliseconds for EVAL scripts, functions and in some cases -# modules' commands before Redis can start processing or rejecting other clients. -# -# If the maximum execution time is reached Redis will start to reply to most -# commands with a BUSY error. -# -# In this state Redis will only allow a handful of commands to be executed. -# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. -# -# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not -# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop -# the server in the case a write command was already issued by the script when -# the user doesn't want to wait for the natural termination of the script. -# -# The default is 5 seconds. It is possible to set it to 0 or a negative value -# to disable this mechanism (uninterrupted execution). Note that in the past -# this config had a different name, which is now an alias, so both of these do -# the same: -# lua-time-limit 5000 -# busy-reply-threshold 5000 +# Set it to 0 or a negative value for unlimited execution without warnings. +lua-time-limit 5000 ################################ REDIS CLUSTER ############################### @@ -1589,11 +1240,6 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires -# you to specify the cluster bus port when executing cluster meet. -# cluster-port 0 - # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1652,21 +1298,12 @@ aof-timestamp-enabled no # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value or -# set cluster-allow-replica-migration to 'no'. +# one replica). To disable migration just set it to a very large value. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 -# Turning off this option allows to use less automatic cluster configuration. -# It both disables migration to orphaned masters and migration from masters -# that became empty. -# -# Default is 'yes' (allow automatic migrations). -# -# cluster-allow-replica-migration yes - # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1681,7 +1318,7 @@ aof-timestamp-enabled no # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the replica can still perform a +# master during master failures. However the master can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1691,7 +1328,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1706,54 +1343,8 @@ aof-timestamp-enabled no # # cluster-allow-reads-when-down no -# This option, when set to yes, allows nodes to serve pubsub shard traffic while -# the cluster is in a down state, as long as it believes it owns the slots. -# -# This is useful if the application would like to use the pubsub feature even when -# the cluster global stable state is not OK. If the application wants to make sure only -# one shard is serving a given channel, this feature should be kept as yes. -# -# cluster-allow-pubsubshard-when-down yes - -# Cluster link send buffer limit is the limit on the memory usage of an individual -# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed -# this limit. This is to primarily prevent send buffers from growing unbounded on links -# toward slow peers (E.g. PubSub messages being piled up). -# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field -# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. -# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single -# PubSub message by default. (client-query-buffer-limit default value is 1gb) -# -# cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for -# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based -# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propagate the removal. -# -# cluster-announce-hostname "" - -# Clusters can advertise how clients should connect to them using either their IP address, -# a user defined hostname, or by declaring they have no endpoint. Which endpoint is -# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type -# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' -# will be returned instead. -# -# When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the -# server doesn't know which one the client took. In this case, the server is expecting -# the client to reach out on the same endpoint it used for making the last request, but use -# the port provided in the response. -# -# cluster-preferred-endpoint-type ip - # In order to setup your cluster make sure to read the documentation -# available at https://redis.io web site. +# available at http://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1763,21 +1354,16 @@ aof-timestamp-enabled no # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following four options are used for this scope, and are: +# following two options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port -# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client ports (for connections -# without and with TLS) and cluster message bus port. The information is then -# published in the header of the bus packets so that other nodes will be able to -# correctly map the address of the node publishing the information. -# -# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set -# to zero, then cluster-announce-port refers to the TLS port. Note also that -# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# Each instructs the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1790,8 +1376,7 @@ aof-timestamp-enabled no # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-tls-port 6379 -# cluster-announce-port 0 +# cluster-announce-port 6379 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1839,24 +1424,10 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 -################################ LATENCY TRACKING ############################## - -# The Redis extended latency monitoring tracks the per command latencies and enables -# exporting the percentile distribution via the INFO latencystats command, -# and cumulative latency distributions (histograms) via the LATENCY command. -# -# By default, the extended latency monitoring is enabled since the overhead -# of keeping track of the command latency is very small. -# latency-tracking yes - -# By default the exported latency percentiles via the INFO latencystats command -# are the p50, p99, and p999. -# latency-tracking-info-percentiles 50 99 99.9 - ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at https://redis.io/topics/notifications +# This feature is documented at http://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1878,11 +1449,9 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) -# n New key events (Note: not included in the 'A' class) # t Stream commands -# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# A Alias for g$lshzxet, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1905,13 +1474,71 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" +############################### GOPHER SERVER ################################# + +# Redis contains an implementation of the Gopher protocol, as specified in +# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). +# +# The Gopher protocol was very popular in the late '90s. It is an alternative +# to the web, and the implementation both server and client side is so simple +# that the Redis server has just 100 lines of code in order to implement this +# support. +# +# What do you do with Gopher nowadays? Well Gopher never *really* died, and +# lately there is a movement in order for the Gopher more hierarchical content +# composed of just plain text documents to be resurrected. Some want a simpler +# internet, others believe that the mainstream internet became too much +# controlled, and it's cool to create an alternative space for people that +# want a bit of fresh air. +# +# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol +# as a gift. +# +# --- HOW IT WORKS? --- +# +# The Redis Gopher support uses the inline protocol of Redis, and specifically +# two kind of inline requests that were anyway illegal: an empty request +# or any request that starts with "/" (there are no Redis commands starting +# with such a slash). Normal RESP2/RESP3 requests are completely out of the +# path of the Gopher protocol implementation and are served as usual as well. +# +# If you open a connection to Redis when Gopher is enabled and send it +# a string like "/foo", if there is a key named "/foo" it is served via the +# Gopher protocol. +# +# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher +# talking), you likely need a script like the following: +# +# https://github.com/antirez/gopher2redis +# +# --- SECURITY WARNING --- +# +# If you plan to put Redis on the internet in a publicly accessible address +# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. +# Once a password is set: +# +# 1. The Gopher server (when enabled, not by default) will still serve +# content via Gopher. +# 2. However other commands cannot be called before the client will +# authenticate. +# +# So use the 'requirepass' option to protect your instance. +# +# Note that Gopher is not currently supported when 'io-threads-do-reads' +# is enabled. +# +# To enable Gopher support, uncomment the following line and set the option +# from no (the default) to yes. +# +# gopher-enabled no + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-listpack-entries 512 -hash-max-listpack-value 64 +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1926,7 +1553,7 @@ hash-max-listpack-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-listpack-size -2 +list-max-ziplist-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1954,8 +1581,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-listpack-entries 128 -zset-max-listpack-value 64 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1977,7 +1604,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entries limit by setting max-bytes to 0 and max-entries to the desired +# max entires limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -2010,7 +1637,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2034,13 +1661,6 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # -# Note that it doesn't make sense to set the replica clients output buffer -# limit lower than the repl-backlog-size config (partial sync will succeed -# and then replica will get disconnected). -# Such a configuration is ignored (the size of repl-backlog-size will be used). -# This doesn't have memory consumption implications since the replica client -# will share the backlog buffers memory. -# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -2054,25 +1674,6 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb -# In some scenarios client connections can hog up memory leading to OOM -# errors or data eviction. To avoid this we can cap the accumulated memory -# used by all client connections (all pubsub and normal clients). Once we -# reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most -# memory first. We call this mechanism "client eviction". -# -# Client eviction is configured using the maxmemory-clients setting as follows: -# 0 - client eviction is disabled (default) -# -# A memory value can be used for the client eviction threshold, -# for example: -# maxmemory-clients 1g -# -# A percentage value (between 1% and 100%) means the client eviction threshold -# is based on a percentage of the maxmemory setting. For example to set client -# eviction at 5% of maxmemory: -# maxmemory-clients 5% - # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -2113,13 +1714,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -2216,7 +1817,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Active defragmentation is disabled by default +# Enabled active defragmentation # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis_7_4_6/docker-compose.yml b/dockge/redis_6_2_20/docker-compose.yml similarity index 94% rename from dockge/redis_7_4_6/docker-compose.yml rename to dockge/redis_6_2_20/docker-compose.yml index fe930bde8..414c1b027 100644 --- a/dockge/redis_7_4_6/docker-compose.yml +++ b/dockge/redis_6_2_20/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:7.4.6-alpine + image: redis:6.2.20-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_7_4_6/envs/default.env b/dockge/redis_6_2_20/envs/default.env similarity index 100% rename from dockge/redis_7_4_6/envs/default.env rename to dockge/redis_6_2_20/envs/default.env diff --git a/dockge/redis_7_4_6/envs/global.env b/dockge/redis_6_2_20/envs/global.env similarity index 100% rename from dockge/redis_7_4_6/envs/global.env rename to dockge/redis_6_2_20/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/.env b/dockge/stream-rec-backend_main/.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/.env rename to dockge/stream-rec-backend_main/.env diff --git a/dockge/stream-rec-backend_0_7_2/docker-compose.yml b/dockge/stream-rec-backend_main/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_0_7_2/docker-compose.yml rename to dockge/stream-rec-backend_main/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-backend_main/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/envs/default.env b/dockge/stream-rec-backend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/default.env rename to dockge/stream-rec-backend_main/envs/default.env diff --git a/dockge/stream-rec-backend_0_7_2/envs/global.env b/dockge/stream-rec-backend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/global.env rename to dockge/stream-rec-backend_main/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/.env b/dockge/stream-rec-frontend_main/.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/.env rename to dockge/stream-rec-frontend_main/.env diff --git a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml b/dockge/stream-rec-frontend_main/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_0_7_2/docker-compose.yml rename to dockge/stream-rec-frontend_main/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-frontend_main/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/envs/default.env b/dockge/stream-rec-frontend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/default.env rename to dockge/stream-rec-frontend_main/envs/default.env diff --git a/dockge/stream-rec-frontend_0_7_2/envs/global.env b/dockge/stream-rec-frontend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/global.env rename to dockge/stream-rec-frontend_main/envs/global.env diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 8465b7136..03a278089 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:dev + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:dev + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_0_7_2/.env b/dockge/stream-rec_dev/.env similarity index 100% rename from dockge/stream-rec_0_7_2/.env rename to dockge/stream-rec_dev/.env diff --git a/dockge/stream-rec_0_7_2/docker-compose.yml b/dockge/stream-rec_dev/docker-compose.yml similarity index 92% rename from dockge/stream-rec_0_7_2/docker-compose.yml rename to dockge/stream-rec_dev/docker-compose.yml index 03a278089..8465b7136 100644 --- a/dockge/stream-rec_0_7_2/docker-compose.yml +++ b/dockge/stream-rec_dev/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_0_7_2/envs/default.env b/dockge/stream-rec_dev/envs/default.env similarity index 100% rename from dockge/stream-rec_0_7_2/envs/default.env rename to dockge/stream-rec_dev/envs/default.env diff --git a/dockge/stream-rec_0_7_2/envs/global.env b/dockge/stream-rec_dev/envs/global.env similarity index 100% rename from dockge/stream-rec_0_7_2/envs/global.env rename to dockge/stream-rec_dev/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 5fa74c158..32a291fcd 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,9 +4,3 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env new file mode 100644 index 000000000..5fa74c158 --- /dev/null +++ b/dockge/uptime-kuma_1_23_16/.env @@ -0,0 +1,12 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= + +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false + diff --git a/dockge/uptime-kuma_2_0_0/docker-compose.yml b/dockge/uptime-kuma_1_23_16/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_2_0_0/docker-compose.yml rename to dockge/uptime-kuma_1_23_16/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma_2_0_0/docker-compose.yml +++ b/dockge/uptime-kuma_1_23_16/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_2_0_0/envs/default.env b/dockge/uptime-kuma_1_23_16/envs/default.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/default.env rename to dockge/uptime-kuma_1_23_16/envs/default.env diff --git a/dockge/uptime-kuma_2_0_0/envs/global.env b/dockge/uptime-kuma_1_23_16/envs/global.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/global.env rename to dockge/uptime-kuma_1_23_16/envs/global.env diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env deleted file mode 100644 index 32a291fcd..000000000 --- a/dockge/uptime-kuma_2_0_0/.env +++ /dev/null @@ -1,6 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - From 5afadb4f1b0975ddaa5ac4e906b9a8e183819c9e Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 17 Oct 2025 03:34:35 +0000 Subject: [PATCH 198/262] Processed apps directory via GitHub Actions --- dockge/affine/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-aria2/.env | 2 +- dockge/alist-aria2/docker-compose.yml | 6 +- .../{alist_4_0_2 => alist-aria2_3_40_0}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-ffmpeg/.env | 2 +- dockge/alist-ffmpeg/docker-compose.yml | 6 +- .../.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist/.env | 2 +- dockge/alist/docker-compose.yml | 6 +- .../{alist-ffmpeg_4_0_2 => alist_3_45_0}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/archivebox/docker-compose.yml | 24 +- .../.env | 0 .../docker-compose.yml | 24 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/baota/docker-compose.yml | 2 +- dockge/{baota_10_0 => baota_9_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../{baota_10_0 => baota_9_0}/envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/emby/docker-compose.yml | 2 +- dockge/{emby_4_8_11_0 => emby_4_9_2_4}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/homarr/.env | 2 +- dockge/homarr/docker-compose.yml | 2 +- dockge/{homarr_0_16_0 => homarr_1_41_0}/.env | 2 +- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/iyuu-plus/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/minio/.env | 5 +- dockge/minio/docker-compose.yml | 6 +- .../.env | 5 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/moontv/.env | 3 + dockge/moontv/docker-compose.yml | 2 +- dockge/{moontv_4_3_0 => moontv_latest}/.env | 3 - .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql/config/my.cnf | 34 +- dockge/mysql/docker-compose.yml | 11 +- dockge/{mysql_8_4_6 => mysql_5_7_44}/.env | 0 dockge/mysql_5_7_44/config/my.cnf | 42 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql_8_4_6/config/my.cnf | 20 - dockge/nacos/docker-compose.yml | 2 +- dockge/{nacos_2_5_1 => nacos_2_4_3}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 0 dockge/postgresql-postgis/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/qbittorrent/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/redis/config/redis.conf | 759 +++++------------- dockge/redis/docker-compose.yml | 2 +- dockge/{redis_6_2_20 => redis_7_4_6}/.env | 0 .../config/redis.conf | 759 +++++++++++++----- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-backend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-frontend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec/docker-compose.yml | 4 +- .../{stream-rec_dev => stream-rec_0_7_2}/.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma/.env | 6 + dockge/uptime-kuma/docker-compose.yml | 11 +- dockge/uptime-kuma_1_23_16/.env | 12 - dockge/uptime-kuma_2_0_0/.env | 6 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 140 files changed, 945 insertions(+), 945 deletions(-) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/.env (100%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/docker-compose.yml (94%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/envs/default.env (100%) rename dockge/{affine_stable-1623f5d => affine_stable-e98f035}/envs/global.env (100%) rename dockge/{alist_4_0_2 => alist-aria2_3_40_0}/.env (93%) rename dockge/{alist-aria2_4_0_2 => alist-aria2_3_40_0}/docker-compose.yml (85%) rename dockge/{alist-aria2_4_0_2 => alist-aria2_3_40_0}/envs/default.env (100%) rename dockge/{alist-aria2_4_0_2 => alist-aria2_3_40_0}/envs/global.env (100%) rename dockge/{alist-aria2_4_0_2 => alist-ffmpeg_3_45_0}/.env (93%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/docker-compose.yml (85%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/envs/default.env (100%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/envs/global.env (100%) rename dockge/{alist-ffmpeg_4_0_2 => alist_3_45_0}/.env (93%) rename dockge/{alist_4_0_2 => alist_3_45_0}/docker-compose.yml (86%) rename dockge/{alist_4_0_2 => alist_3_45_0}/envs/default.env (100%) rename dockge/{alist_4_0_2 => alist_3_45_0}/envs/global.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/docker-compose.yml (60%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/envs/default.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5rc51}/envs/global.env (100%) rename dockge/{baota_10_0 => baota_9_0}/.env (100%) rename dockge/{baota_10_0 => baota_9_0}/docker-compose.yml (92%) rename dockge/{baota_10_0 => baota_9_0}/envs/default.env (100%) rename dockge/{baota_10_0 => baota_9_0}/envs/global.env (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/.env (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/categories.json (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/config.yaml (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/config/template.html (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/docker-compose.yml (88%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/envs/default.env (100%) rename dockge/{bili-fetcher_1_6_8 => bili-fetcher_latest}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/.env (100%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_8_19_5 => elastic-elasticsearch_9_1_5}/envs/global.env (100%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/.env (100%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/docker-compose.yml (95%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/envs/default.env (100%) rename dockge/{elastic-kibana_8_19_5 => elastic-kibana_9_1_5}/envs/global.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/docker-compose.yml (96%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/envs/default.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_4}/envs/global.env (100%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/.env (67%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/docker-compose.yml (89%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/default.env (100%) rename dockge/{homarr_0_16_0 => homarr_1_41_0}/envs/global.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/docker-compose.yml (95%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/envs/default.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/envs/global.env (100%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/.env (86%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/docker-compose.yml (83%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/envs/default.env (100%) rename dockge/{minio_2025-09-07 => minio_2025-04-22}/envs/global.env (100%) rename dockge/{moontv_4_3_0 => moontv_latest}/.env (95%) rename dockge/{moontv_4_3_0 => moontv_latest}/docker-compose.yml (87%) rename dockge/{moontv_4_3_0 => moontv_latest}/envs/default.env (100%) rename dockge/{moontv_4_3_0 => moontv_latest}/envs/global.env (100%) rename dockge/{mysql_8_4_6 => mysql_5_7_44}/.env (100%) create mode 100644 dockge/mysql_5_7_44/config/my.cnf rename dockge/{mysql_8_4_6 => mysql_5_7_44}/docker-compose.yml (65%) rename dockge/{mysql_8_4_6 => mysql_5_7_44}/envs/default.env (100%) rename dockge/{mysql_8_4_6 => mysql_5_7_44}/envs/global.env (100%) delete mode 100644 dockge/mysql_8_4_6/config/my.cnf rename dockge/{nacos_2_5_1 => nacos_2_4_3}/.env (100%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/docker-compose.yml (94%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/envs/default.env (100%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/envs/global.env (100%) rename dockge/{nacos_2_5_1 => nacos_2_4_3}/init/mysql-schema.sql (100%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/.env (100%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/docker-compose.yml (94%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/envs/default.env (100%) rename dockge/{postgresql-postgis_17-3_5 => postgresql-postgis_16-3_5}/envs/global.env (100%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/.env (100%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/docker-compose.yml (89%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/envs/default.env (100%) rename dockge/{postgresql_pg14 => postgresql_17_6-alpine}/envs/global.env (100%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/.env (100%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/docker-compose.yml (95%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/envs/default.env (100%) rename dockge/{qbittorrent_5_1_2 => qbittorrent_4_6_7}/envs/global.env (100%) rename dockge/{redis_6_2_20 => redis_7_4_6}/.env (100%) rename dockge/{redis_6_2_20 => redis_7_4_6}/config/redis.conf (72%) rename dockge/{redis_6_2_20 => redis_7_4_6}/docker-compose.yml (94%) rename dockge/{redis_6_2_20 => redis_7_4_6}/envs/default.env (100%) rename dockge/{redis_6_2_20 => redis_7_4_6}/envs/global.env (100%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/.env (100%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/docker-compose.yml (92%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec-backend_main => stream-rec-backend_0_7_2}/envs/global.env (100%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/.env (100%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/docker-compose.yml (87%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec-frontend_main => stream-rec-frontend_0_7_2}/envs/global.env (100%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/.env (100%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/docker-compose.yml (92%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec_dev => stream-rec_0_7_2}/envs/global.env (100%) delete mode 100644 dockge/uptime-kuma_1_23_16/.env create mode 100644 dockge/uptime-kuma_2_0_0/.env rename dockge/{uptime-kuma_1_23_16 => uptime-kuma_2_0_0}/docker-compose.yml (57%) rename dockge/{uptime-kuma_1_23_16 => uptime-kuma_2_0_0}/envs/default.env (100%) rename dockge/{uptime-kuma_1_23_16 => uptime-kuma_2_0_0}/envs/global.env (100%) diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 94a383ee2..18926413f 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-1623f5d/.env b/dockge/affine_stable-e98f035/.env similarity index 100% rename from dockge/affine_stable-1623f5d/.env rename to dockge/affine_stable-e98f035/.env diff --git a/dockge/affine_stable-1623f5d/docker-compose.yml b/dockge/affine_stable-e98f035/docker-compose.yml similarity index 94% rename from dockge/affine_stable-1623f5d/docker-compose.yml rename to dockge/affine_stable-e98f035/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine_stable-1623f5d/docker-compose.yml +++ b/dockge/affine_stable-e98f035/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-1623f5d/envs/default.env b/dockge/affine_stable-e98f035/envs/default.env similarity index 100% rename from dockge/affine_stable-1623f5d/envs/default.env rename to dockge/affine_stable-e98f035/envs/default.env diff --git a/dockge/affine_stable-1623f5d/envs/global.env b/dockge/affine_stable-e98f035/envs/global.env similarity index 100% rename from dockge/affine_stable-1623f5d/envs/global.env rename to dockge/affine_stable-e98f035/envs/global.env diff --git a/dockge/alist-aria2/.env b/dockge/alist-aria2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-aria2/.env +++ b/dockge/alist-aria2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index a6913980a..d11a2d481 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist-aria2: + openlist: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist-aria2:v3.40.0 + image: openlistteam/openlist:v4.0.2-aria2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_4_0_2/.env b/dockge/alist-aria2_3_40_0/.env similarity index 93% rename from dockge/alist_4_0_2/.env rename to dockge/alist-aria2_3_40_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist_4_0_2/.env +++ b/dockge/alist-aria2_3_40_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2_4_0_2/docker-compose.yml b/dockge/alist-aria2_3_40_0/docker-compose.yml similarity index 85% rename from dockge/alist-aria2_4_0_2/docker-compose.yml rename to dockge/alist-aria2_3_40_0/docker-compose.yml index d11a2d481..a6913980a 100644 --- a/dockge/alist-aria2_4_0_2/docker-compose.yml +++ b/dockge/alist-aria2_3_40_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist-aria2: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-aria2 + image: qyg2297248353/alist-aria2:v3.40.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_4_0_2/envs/default.env b/dockge/alist-aria2_3_40_0/envs/default.env similarity index 100% rename from dockge/alist-aria2_4_0_2/envs/default.env rename to dockge/alist-aria2_3_40_0/envs/default.env diff --git a/dockge/alist-aria2_4_0_2/envs/global.env b/dockge/alist-aria2_3_40_0/envs/global.env similarity index 100% rename from dockge/alist-aria2_4_0_2/envs/global.env rename to dockge/alist-aria2_3_40_0/envs/global.env diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: openlistteam/openlist:v4.0.2-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_4_0_2/.env b/dockge/alist-ffmpeg_3_45_0/.env similarity index 93% rename from dockge/alist-aria2_4_0_2/.env rename to dockge/alist-ffmpeg_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-aria2_4_0_2/.env +++ b/dockge/alist-ffmpeg_3_45_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg_4_0_2/docker-compose.yml b/dockge/alist-ffmpeg_3_45_0/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_4_0_2/docker-compose.yml rename to dockge/alist-ffmpeg_3_45_0/docker-compose.yml index ded9a5b7e..37149a612 100644 --- a/dockge/alist-ffmpeg_4_0_2/docker-compose.yml +++ b/dockge/alist-ffmpeg_3_45_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_4_0_2/envs/default.env b/dockge/alist-ffmpeg_3_45_0/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_4_0_2/envs/default.env rename to dockge/alist-ffmpeg_3_45_0/envs/default.env diff --git a/dockge/alist-ffmpeg_4_0_2/envs/global.env b/dockge/alist-ffmpeg_3_45_0/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_4_0_2/envs/global.env rename to dockge/alist-ffmpeg_3_45_0/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: openlistteam/openlist:v4.0.2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_4_0_2/.env b/dockge/alist_3_45_0/.env similarity index 93% rename from dockge/alist-ffmpeg_4_0_2/.env rename to dockge/alist_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg_4_0_2/.env +++ b/dockge/alist_3_45_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist_4_0_2/docker-compose.yml b/dockge/alist_3_45_0/docker-compose.yml similarity index 86% rename from dockge/alist_4_0_2/docker-compose.yml rename to dockge/alist_3_45_0/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist_4_0_2/docker-compose.yml +++ b/dockge/alist_3_45_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_4_0_2/envs/default.env b/dockge/alist_3_45_0/envs/default.env similarity index 100% rename from dockge/alist_4_0_2/envs/default.env rename to dockge/alist_3_45_0/envs/default.env diff --git a/dockge/alist_4_0_2/envs/global.env b/dockge/alist_3_45_0/envs/global.env similarity index 100% rename from dockge/alist_4_0_2/envs/global.env rename to dockge/alist_3_45_0/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index ac22205db..f70ce3cc2 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/docker-compose.yml @@ -4,8 +4,6 @@ networks: services: archivebox: container_name: archivebox - depends_on: - - archivebox-init env_file: - ./envs/global.env - .env @@ -16,7 +14,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 + image: archivebox/archivebox:0.7.3 labels: createdBy: Apps networks: @@ -26,26 +24,6 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data - archivebox-init: - command: archivebox init - container_name: init-archivebox - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - ALLOWED_HOSTS=* - - CSRF_TRUSTED_ORIGINS=http://localhost:8000 - - SEARCH_BACKEND_ENGINE=sonic - - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 - labels: - createdBy: Apps - networks: - - 1panel-network - volumes: - - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_7_3/.env b/dockge/archivebox_0_8_5rc51/.env similarity index 100% rename from dockge/archivebox_0_7_3/.env rename to dockge/archivebox_0_8_5rc51/.env diff --git a/dockge/archivebox_0_7_3/docker-compose.yml b/dockge/archivebox_0_8_5rc51/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_7_3/docker-compose.yml rename to dockge/archivebox_0_8_5rc51/docker-compose.yml index f70ce3cc2..ac22205db 100644 --- a/dockge/archivebox_0_7_3/docker-compose.yml +++ b/dockge/archivebox_0_8_5rc51/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: archivebox: container_name: archivebox + depends_on: + - archivebox-init env_file: - ./envs/global.env - .env @@ -14,7 +16,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.7.3 + image: archivebox/archivebox:0.8.5rc51 labels: createdBy: Apps networks: @@ -24,6 +26,26 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data + archivebox-init: + command: archivebox init + container_name: init-archivebox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - ALLOWED_HOSTS=* + - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - SEARCH_BACKEND_ENGINE=sonic + - SEARCH_BACKEND_HOST_NAME=archivebox-sonic + - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} + image: archivebox/archivebox:0.8.5rc51 + labels: + createdBy: Apps + networks: + - 1panel-network + volumes: + - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_7_3/envs/default.env b/dockge/archivebox_0_8_5rc51/envs/default.env similarity index 100% rename from dockge/archivebox_0_7_3/envs/default.env rename to dockge/archivebox_0_8_5rc51/envs/default.env diff --git a/dockge/archivebox_0_7_3/envs/global.env b/dockge/archivebox_0_8_5rc51/envs/global.env similarity index 100% rename from dockge/archivebox_0_7_3/envs/global.env rename to dockge/archivebox_0_8_5rc51/envs/global.env diff --git a/dockge/baota/docker-compose.yml b/dockge/baota/docker-compose.yml index c28254802..678152df3 100644 --- a/dockge/baota/docker-compose.yml +++ b/dockge/baota/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:9.0_lts_latest + image: btpanel/baota:10.0_lts labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_10_0/.env b/dockge/baota_9_0/.env similarity index 100% rename from dockge/baota_10_0/.env rename to dockge/baota_9_0/.env diff --git a/dockge/baota_10_0/docker-compose.yml b/dockge/baota_9_0/docker-compose.yml similarity index 92% rename from dockge/baota_10_0/docker-compose.yml rename to dockge/baota_9_0/docker-compose.yml index 678152df3..c28254802 100644 --- a/dockge/baota_10_0/docker-compose.yml +++ b/dockge/baota_9_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:10.0_lts + image: btpanel/baota:9.0_lts_latest labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_10_0/envs/default.env b/dockge/baota_9_0/envs/default.env similarity index 100% rename from dockge/baota_10_0/envs/default.env rename to dockge/baota_9_0/envs/default.env diff --git a/dockge/baota_10_0/envs/global.env b/dockge/baota_9_0/envs/global.env similarity index 100% rename from dockge/baota_10_0/envs/global.env rename to dockge/baota_9_0/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index c68c76b14..af4782f89 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_1_6_8/.env b/dockge/bili-fetcher_latest/.env similarity index 100% rename from dockge/bili-fetcher_1_6_8/.env rename to dockge/bili-fetcher_latest/.env diff --git a/dockge/bili-fetcher_1_6_8/config/categories.json b/dockge/bili-fetcher_latest/config/categories.json similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/categories.json rename to dockge/bili-fetcher_latest/config/categories.json diff --git a/dockge/bili-fetcher_1_6_8/config/config.yaml b/dockge/bili-fetcher_latest/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/config.yaml rename to dockge/bili-fetcher_latest/config/config.yaml diff --git a/dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml b/dockge/bili-fetcher_latest/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml rename to dockge/bili-fetcher_latest/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py b/dockge/bili-fetcher_latest/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py rename to dockge/bili-fetcher_latest/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py b/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_latest/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_1_6_8/config/template.html b/dockge/bili-fetcher_latest/config/template.html similarity index 100% rename from dockge/bili-fetcher_1_6_8/config/template.html rename to dockge/bili-fetcher_latest/config/template.html diff --git a/dockge/bili-fetcher_1_6_8/docker-compose.yml b/dockge/bili-fetcher_latest/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_1_6_8/docker-compose.yml rename to dockge/bili-fetcher_latest/docker-compose.yml index af4782f89..c68c76b14 100644 --- a/dockge/bili-fetcher_1_6_8/docker-compose.yml +++ b/dockge/bili-fetcher_latest/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.8 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.8 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_1_6_8/envs/default.env b/dockge/bili-fetcher_latest/envs/default.env similarity index 100% rename from dockge/bili-fetcher_1_6_8/envs/default.env rename to dockge/bili-fetcher_latest/envs/default.env diff --git a/dockge/bili-fetcher_1_6_8/envs/global.env b/dockge/bili-fetcher_latest/envs/global.env similarity index 100% rename from dockge/bili-fetcher_1_6_8/envs/global.env rename to dockge/bili-fetcher_latest/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index 095cf8284..d618229ca 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.1.5 + image: elasticsearch:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_19_5/.env b/dockge/elastic-elasticsearch_9_1_5/.env similarity index 100% rename from dockge/elastic-elasticsearch_8_19_5/.env rename to dockge/elastic-elasticsearch_9_1_5/.env diff --git a/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml b/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_8_19_5/docker-compose.yml rename to dockge/elastic-elasticsearch_9_1_5/docker-compose.yml index d618229ca..095cf8284 100644 --- a/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml +++ b/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.5 + image: elasticsearch:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_19_5/envs/default.env b/dockge/elastic-elasticsearch_9_1_5/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_8_19_5/envs/default.env rename to dockge/elastic-elasticsearch_9_1_5/envs/default.env diff --git a/dockge/elastic-elasticsearch_8_19_5/envs/global.env b/dockge/elastic-elasticsearch_9_1_5/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_8_19_5/envs/global.env rename to dockge/elastic-elasticsearch_9_1_5/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index 1a784d0e3..c7d0828cd 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.1.5 + image: kibana:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_19_5/.env b/dockge/elastic-kibana_9_1_5/.env similarity index 100% rename from dockge/elastic-kibana_8_19_5/.env rename to dockge/elastic-kibana_9_1_5/.env diff --git a/dockge/elastic-kibana_8_19_5/docker-compose.yml b/dockge/elastic-kibana_9_1_5/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_8_19_5/docker-compose.yml rename to dockge/elastic-kibana_9_1_5/docker-compose.yml index c7d0828cd..1a784d0e3 100644 --- a/dockge/elastic-kibana_8_19_5/docker-compose.yml +++ b/dockge/elastic-kibana_9_1_5/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.19.5 + image: kibana:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_19_5/envs/default.env b/dockge/elastic-kibana_9_1_5/envs/default.env similarity index 100% rename from dockge/elastic-kibana_8_19_5/envs/default.env rename to dockge/elastic-kibana_9_1_5/envs/default.env diff --git a/dockge/elastic-kibana_8_19_5/envs/global.env b/dockge/elastic-kibana_9_1_5/envs/global.env similarity index 100% rename from dockge/elastic-kibana_8_19_5/envs/global.env rename to dockge/elastic-kibana_9_1_5/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index 1e9567477..a461e63ac 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_2_4/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_2_4/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_2_4/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_2_4/docker-compose.yml index a461e63ac..1e9567477 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_2_4/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/emby_4_9_2_4/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_2_4/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_2_4/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_2_4/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 06b42b32c..8568f94b3 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/ajnart/homarr:0.16.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_0/.env b/dockge/homarr_1_41_0/.env similarity index 67% rename from dockge/homarr_0_16_0/.env rename to dockge/homarr_1_41_0/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr_0_16_0/.env +++ b/dockge/homarr_1_41_0/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr_0_16_0/docker-compose.yml b/dockge/homarr_1_41_0/docker-compose.yml similarity index 89% rename from dockge/homarr_0_16_0/docker-compose.yml rename to dockge/homarr_1_41_0/docker-compose.yml index 8568f94b3..06b42b32c 100644 --- a/dockge/homarr_0_16_0/docker-compose.yml +++ b/dockge/homarr_1_41_0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_0_16_0/envs/default.env b/dockge/homarr_1_41_0/envs/default.env similarity index 100% rename from dockge/homarr_0_16_0/envs/default.env rename to dockge/homarr_1_41_0/envs/default.env diff --git a/dockge/homarr_0_16_0/envs/global.env b/dockge/homarr_1_41_0/envs/global.env similarity index 100% rename from dockge/homarr_0_16_0/envs/global.env rename to dockge/homarr_1_41_0/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 39b4c1ba0..142aaa4d5 100644 --- a/dockge/iyuu-plus/docker-compose.yml +++ b/dockge/iyuu-plus/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest-mysql/.env b/dockge/iyuu-plus_latest/.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/.env rename to dockge/iyuu-plus_latest/.env diff --git a/dockge/iyuu-plus_latest-mysql/docker-compose.yml b/dockge/iyuu-plus_latest/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest-mysql/docker-compose.yml rename to dockge/iyuu-plus_latest/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus_latest-mysql/docker-compose.yml +++ b/dockge/iyuu-plus_latest/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus:latest + image: iyuucn/iyuuplus-nodb:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest-mysql/envs/default.env b/dockge/iyuu-plus_latest/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/envs/default.env rename to dockge/iyuu-plus_latest/envs/default.env diff --git a/dockge/iyuu-plus_latest-mysql/envs/global.env b/dockge/iyuu-plus_latest/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/envs/global.env rename to dockge/iyuu-plus_latest/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.env @@ -4,9 +4,12 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 [必填] +# API 端口 (映射内部端口) [必填] PANEL_APP_PORT_API=9000 +# API 内部端口 [必填] +MINIO_API_PORT=9000 + # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index 2bc78e830..4e37e835a 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-09-07T16-13-09Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-09-07/.env b/dockge/minio_2025-04-22/.env similarity index 86% rename from dockge/minio_2025-09-07/.env rename to dockge/minio_2025-04-22/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio_2025-09-07/.env +++ b/dockge/minio_2025-04-22/.env @@ -4,12 +4,9 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 (映射内部端口) [必填] +# API 端口 [必填] PANEL_APP_PORT_API=9000 -# API 内部端口 [必填] -MINIO_API_PORT=9000 - # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio_2025-09-07/docker-compose.yml b/dockge/minio_2025-04-22/docker-compose.yml similarity index 83% rename from dockge/minio_2025-09-07/docker-compose.yml rename to dockge/minio_2025-04-22/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio_2025-09-07/docker-compose.yml +++ b/dockge/minio_2025-04-22/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-09-07/envs/default.env b/dockge/minio_2025-04-22/envs/default.env similarity index 100% rename from dockge/minio_2025-09-07/envs/default.env rename to dockge/minio_2025-04-22/envs/default.env diff --git a/dockge/minio_2025-09-07/envs/global.env b/dockge/minio_2025-04-22/envs/global.env similarity index 100% rename from dockge/minio_2025-09-07/envs/global.env rename to dockge/minio_2025-04-22/envs/global.env diff --git a/dockge/moontv/.env b/dockge/moontv/.env index 4f33d3980..c1e2d49fa 100644 --- a/dockge/moontv/.env +++ b/dockge/moontv/.env @@ -4,6 +4,9 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 +# Authorization Code [必填] +AUTH_TOKEN= + # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv/docker-compose.yml b/dockge/moontv/docker-compose.yml index eedce5001..399cbb8a3 100644 --- a/dockge/moontv/docker-compose.yml +++ b/dockge/moontv/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:latest + image: ghcr.io/moontechlab/lunatv:4.3.0 labels: createdBy: Apps networks: diff --git a/dockge/moontv_4_3_0/.env b/dockge/moontv_latest/.env similarity index 95% rename from dockge/moontv_4_3_0/.env rename to dockge/moontv_latest/.env index c1e2d49fa..4f33d3980 100644 --- a/dockge/moontv_4_3_0/.env +++ b/dockge/moontv_latest/.env @@ -4,9 +4,6 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 -# Authorization Code [必填] -AUTH_TOKEN= - # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv_4_3_0/docker-compose.yml b/dockge/moontv_latest/docker-compose.yml similarity index 87% rename from dockge/moontv_4_3_0/docker-compose.yml rename to dockge/moontv_latest/docker-compose.yml index 399cbb8a3..eedce5001 100644 --- a/dockge/moontv_4_3_0/docker-compose.yml +++ b/dockge/moontv_latest/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:4.3.0 + image: ghcr.io/moontechlab/lunatv:latest labels: createdBy: Apps networks: diff --git a/dockge/moontv_4_3_0/envs/default.env b/dockge/moontv_latest/envs/default.env similarity index 100% rename from dockge/moontv_4_3_0/envs/default.env rename to dockge/moontv_latest/envs/default.env diff --git a/dockge/moontv_4_3_0/envs/global.env b/dockge/moontv_latest/envs/global.env similarity index 100% rename from dockge/moontv_4_3_0/envs/global.env rename to dockge/moontv_latest/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index 6d6e1a932..c53ca32dc 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,42 +1,20 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - [mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache +host_cache_size=0 skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files user=mysql -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M +mysql_native_password=ON character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 +log_bin_trust_function_creators=1 +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index 5cac14f48..ba5d56398 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,14 +5,13 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --lower_case_table_names=1 - - --collation-server=utf8mb4_general_ci - - --explicit_defaults_for_timestamp=true + - --collation-server=utf8mb4_unicode_ci + - --mysql-native-password=ON container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:5.7.44 + image: mysql:8.4.6 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_8_4_6/.env b/dockge/mysql_5_7_44/.env similarity index 100% rename from dockge/mysql_8_4_6/.env rename to dockge/mysql_5_7_44/.env diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf new file mode 100644 index 000000000..6d6e1a932 --- /dev/null +++ b/dockge/mysql_5_7_44/config/my.cnf @@ -0,0 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + +[mysqld] +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files +user=mysql + +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M +character_set_server=utf8mb4 +lower_case_table_names=1 +group_concat_max_len=1024000 + +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_8_4_6/docker-compose.yml b/dockge/mysql_5_7_44/docker-compose.yml similarity index 65% rename from dockge/mysql_8_4_6/docker-compose.yml rename to dockge/mysql_5_7_44/docker-compose.yml index ba5d56398..5cac14f48 100644 --- a/dockge/mysql_8_4_6/docker-compose.yml +++ b/dockge/mysql_5_7_44/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.6 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_8_4_6/envs/default.env b/dockge/mysql_5_7_44/envs/default.env similarity index 100% rename from dockge/mysql_8_4_6/envs/default.env rename to dockge/mysql_5_7_44/envs/default.env diff --git a/dockge/mysql_8_4_6/envs/global.env b/dockge/mysql_5_7_44/envs/global.env similarity index 100% rename from dockge/mysql_8_4_6/envs/global.env rename to dockge/mysql_5_7_44/envs/global.env diff --git a/dockge/mysql_8_4_6/config/my.cnf b/dockge/mysql_8_4_6/config/my.cnf deleted file mode 100644 index c53ca32dc..000000000 --- a/dockge/mysql_8_4_6/config/my.cnf +++ /dev/null @@ -1,20 +0,0 @@ -[mysqld] -host_cache_size=0 -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -user=mysql - -mysql_native_password=ON -character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci -lower_case_table_names=1 -group_concat_max_len=1024000 -log_bin_trust_function_creators=1 - -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index cf220b000..7e925e038 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_1/.env b/dockge/nacos_2_4_3/.env similarity index 100% rename from dockge/nacos_2_5_1/.env rename to dockge/nacos_2_4_3/.env diff --git a/dockge/nacos_2_5_1/docker-compose.yml b/dockge/nacos_2_4_3/docker-compose.yml similarity index 94% rename from dockge/nacos_2_5_1/docker-compose.yml rename to dockge/nacos_2_4_3/docker-compose.yml index 7e925e038..cf220b000 100644 --- a/dockge/nacos_2_5_1/docker-compose.yml +++ b/dockge/nacos_2_4_3/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_1/envs/default.env b/dockge/nacos_2_4_3/envs/default.env similarity index 100% rename from dockge/nacos_2_5_1/envs/default.env rename to dockge/nacos_2_4_3/envs/default.env diff --git a/dockge/nacos_2_5_1/envs/global.env b/dockge/nacos_2_4_3/envs/global.env similarity index 100% rename from dockge/nacos_2_5_1/envs/global.env rename to dockge/nacos_2_4_3/envs/global.env diff --git a/dockge/nacos_2_5_1/init/mysql-schema.sql b/dockge/nacos_2_4_3/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_2_5_1/init/mysql-schema.sql rename to dockge/nacos_2_4_3/init/mysql-schema.sql diff --git a/dockge/postgresql-postgis/docker-compose.yml b/dockge/postgresql-postgis/docker-compose.yml index eded4fd3c..a2cced821 100644 --- a/dockge/postgresql-postgis/docker-compose.yml +++ b/dockge/postgresql-postgis/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:16-3.5 + image: postgis/postgis:17-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_17-3_5/.env b/dockge/postgresql-postgis_16-3_5/.env similarity index 100% rename from dockge/postgresql-postgis_17-3_5/.env rename to dockge/postgresql-postgis_16-3_5/.env diff --git a/dockge/postgresql-postgis_17-3_5/docker-compose.yml b/dockge/postgresql-postgis_16-3_5/docker-compose.yml similarity index 94% rename from dockge/postgresql-postgis_17-3_5/docker-compose.yml rename to dockge/postgresql-postgis_16-3_5/docker-compose.yml index a2cced821..eded4fd3c 100644 --- a/dockge/postgresql-postgis_17-3_5/docker-compose.yml +++ b/dockge/postgresql-postgis_16-3_5/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:17-3.5 + image: postgis/postgis:16-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_17-3_5/envs/default.env b/dockge/postgresql-postgis_16-3_5/envs/default.env similarity index 100% rename from dockge/postgresql-postgis_17-3_5/envs/default.env rename to dockge/postgresql-postgis_16-3_5/envs/default.env diff --git a/dockge/postgresql-postgis_17-3_5/envs/global.env b/dockge/postgresql-postgis_16-3_5/envs/global.env similarity index 100% rename from dockge/postgresql-postgis_17-3_5/envs/global.env rename to dockge/postgresql-postgis_16-3_5/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index e8ef19ae8..9724e766c 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg14-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:17.6-alpine + image: postgres:14 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14/.env b/dockge/postgresql_17_6-alpine/.env similarity index 100% rename from dockge/postgresql_pg14/.env rename to dockge/postgresql_17_6-alpine/.env diff --git a/dockge/postgresql_pg14/docker-compose.yml b/dockge/postgresql_17_6-alpine/docker-compose.yml similarity index 89% rename from dockge/postgresql_pg14/docker-compose.yml rename to dockge/postgresql_17_6-alpine/docker-compose.yml index 9724e766c..e8ef19ae8 100644 --- a/dockge/postgresql_pg14/docker-compose.yml +++ b/dockge/postgresql_17_6-alpine/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:14 + image: postgres:17.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14/envs/default.env b/dockge/postgresql_17_6-alpine/envs/default.env similarity index 100% rename from dockge/postgresql_pg14/envs/default.env rename to dockge/postgresql_17_6-alpine/envs/default.env diff --git a/dockge/postgresql_pg14/envs/global.env b/dockge/postgresql_17_6-alpine/envs/global.env similarity index 100% rename from dockge/postgresql_pg14/envs/global.env rename to dockge/postgresql_17_6-alpine/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458b..116044519 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/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:4.6.7 + image: linuxserver/qbittorrent:5.1.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_2/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_1_2/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_1_2/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_1_2/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index 116044519..5ec4b458b 100644 --- a/dockge/qbittorrent_5_1_2/docker-compose.yml +++ b/dockge/qbittorrent_4_6_7/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.1.2 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_2/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_1_2/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/qbittorrent_5_1_2/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_1_2/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env diff --git a/dockge/redis/config/redis.conf b/dockge/redis/config/redis.conf index 8795ae291..ca22ec9f6 100644 --- a/dockge/redis/config/redis.conf +++ b/dockge/redis/config/redis.conf @@ -32,17 +32,8 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # -# Included paths may contain wildcards. All files matching the wildcards will -# be included in alphabetical order. -# Note that if an include path contains a wildcards but no files match it when -# the server is started, the include statement will be ignored and no error will -# be emitted. It is safe, therefore, to include wildcard files from empty -# directories. -# # include /path/to/local.conf # include /path/to/other.conf -# include /path/to/fragments/*.conf -# ################################## MODULES ##################################### @@ -58,81 +49,43 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. -# Each address can be prefixed by "-", which means that redis will not fail to -# start if the address is not available. Being not available only refers to -# addresses that does not correspond to any network interface. Addresses that -# are already in use will always fail, and unsupported protocols will always BE -# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses -# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 -# bind * -::* # like the default, all available interfaces +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis -# will only be able to accept client connections from the same host that it is -# running on). +# IPv4 loopback interface address (this means Redis will only be able to +# accept client connections from the same host that it is running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# COMMENT OUT THE FOLLOWING LINE. -# -# You will also need to set a password unless you explicitly disable protected -# mode. +# JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 -# By default, outgoing connections (from replica to master, from Sentinel to -# instances, cluster bus, etc.) are not bound to a specific local address. In -# most cases, this means the operating system will handle that based on routing -# and the interface through which the connection goes out. -# -# Using bind-source-addr it is possible to configure a specific address to bind -# to, which may also affect how the connection gets routed. -# -# Example: -# -# bind-source-addr 10.0.0.1 - # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and the default user has no password, the server -# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address -# (::1) or Unix domain sockets. +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured. +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. protected-mode yes -# Redis uses default hardened security configuration directives to reduce the -# attack surface on innocent users. Therefore, several sensitive configuration -# directives are immutable, and some potentially-dangerous commands are blocked. -# -# Configuration directives that control files that Redis writes to (e.g., 'dir' -# and 'dbfilename') and that aren't usually modified during runtime -# are protected by making them immutable. -# -# Commands that can increase the attack surface of Redis and that aren't usually -# called by users are blocked by default. -# -# These can be exposed to either all connections or just local ones by setting -# each of the configs listed below to either of these values: -# -# no - Block for any connection (remain immutable) -# yes - Allow for any connection (no protection) -# local - Allow only for local connections. Ones originating from the -# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. -# -# enable-protected-configs no -# enable-debug-command no -# enable-module-command no - # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -152,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /run/redis.sock +# unixsocket /tmp/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -175,16 +128,6 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 -# Apply OS-specific mechanism to mark the listening socket with the specified -# ID, to support advanced routing and filtering capabilities. -# -# On Linux, the ID represents a connection mark. -# On FreeBSD, the ID represents a socket cookie ID. -# On OpenBSD, the ID represents a route table ID. -# -# The default value is 0, which implies no marking is required. -# socket-mark-id 0 - ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -200,32 +143,8 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-key-file-pass secret -# Normally Redis uses the same certificate for both server functions (accepting -# connections) and client functions (replicating from a master, establishing -# cluster bus connections, etc.). -# -# Sometimes certificates are issued with attributes that designate them as -# client-only or server-only certificates. In that case it may be desired to use -# different certificates for incoming (server) and outgoing (client) -# connections. To do that, use the following directives: -# -# tls-client-cert-file client.crt -# tls-client-key-file client.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-client-key-file-pass secret - -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, -# required by older versions of OpenSSL (<3.0). Newer versions do not require -# this configuration and recommend against it. +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # # tls-dh-params-file redis.dh @@ -258,12 +177,9 @@ tcp-keepalive 300 # # tls-cluster yes -# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended -# that older formally deprecated versions are kept disabled to reduce the attack surface. -# You can explicitly specify TLS versions to support. -# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", -# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. -# To enable only TLSv1.2 and TLSv1.3, use: +# Explicitly specify TLS versions to support. Allowed values are case insensitive +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or +# any combination. To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -305,7 +221,6 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -314,17 +229,11 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET -# on startup, and updating Redis status on a regular -# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -# -# The default is "no". To run under upstart/systemd, you can simply uncomment -# the line below: -# -# supervised auto +supervised no # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -335,9 +244,6 @@ daemonize no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -# -# Note that on modern Linux systems "/run/redis.pid" is more conforming -# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -363,74 +269,44 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 -# To disable the built in crash log, which will possibly produce cleaner core -# dumps when they are needed, uncomment the following: -# -# crash-log-enabled no - -# To disable the fast memory check that's run as part of the crash log, which -# will possibly let redis terminate sooner, uncomment the following: -# -# crash-memcheck-enabled no - # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY and syslog logging is -# disabled. Basically this means that normally a logo is displayed only in -# interactive sessions. +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo no - -# By default, Redis modifies the process title (as seen in 'top' and 'ps') to -# provide some runtime information. It is possible to disable this and leave -# the process name as executed by setting the following to no. -set-proc-title yes - -# When changing the process title, Redis uses the following template to construct -# the modified title. -# -# Template variables are specified in curly brackets. The following variables are -# supported: -# -# {title} Name of process as executed if parent, or type of child process. -# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or -# Unix socket if only that's available. -# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". -# {port} TCP port listening on, or 0. -# {tls-port} TLS port listening on, or 0. -# {unixsocket} Unix domain socket listening on, or "". -# {config-file} Name of configuration file used. -# -proc-title-template "{title} {listen-addr} {server-mode}" +always-show-logo yes ################################ SNAPSHOTTING ################################ +# +# Save the DB on disk: +# +# save +# +# Will save the DB if both the given number of seconds and the given +# number of write operations against the DB occurred. +# +# In the example below the behavior will be to save: +# after 900 sec (15 min) if at least 1 key changed +# after 300 sec (5 min) if at least 10 keys changed +# after 60 sec if at least 10000 keys changed +# +# Note: you can disable saving completely by commenting out all "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" -# Save the DB to disk. -# -# save [ ...] -# -# Redis will save the DB if the given number of seconds elapsed and it -# surpassed the given number of write operations against the DB. -# -# Snapshotting can be completely disabled with a single empty string argument -# as in following example: -# -# save "" -# -# Unless specified otherwise, by default Redis will save the DB: -# * After 3600 seconds (an hour) if at least 1 change was performed -# * After 300 seconds (5 minutes) if at least 100 changes were performed -# * After 60 seconds if at least 10000 changes were performed -# -# You can set these explicitly by uncommenting the following line. -# -# save 3600 1 300 100 60 10000 +save 900 1 +save 300 10 +save 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -462,21 +338,6 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes -# Enables or disables full sanitization checks for ziplist and listpack etc when -# loading an RDB or RESTORE payload. This reduces the chances of a assertion or -# crash later on while processing commands. -# Options: -# no - Never perform full sanitization -# yes - Always perform full sanitization -# clients - Perform full sanitization only for user connections. -# Excludes: RDB files, RESTORE commands received from the master -# connection, and client connections which have the -# skip-sanitize-payload ACL flag. -# The default should be 'clients' but since it currently affects cluster -# resharding via MIGRATE, it is temporarily set to 'no' by default. -# -# sanitize-dump-payload no - # The filename where to dump the DB dbfilename dump.rdb @@ -551,10 +412,9 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error -# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" -# to all data access commands, excluding commands such as: -# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with +# an error "SYNC with master in progress" to all commands except: +# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -603,7 +463,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync yes +repl-diskless-sync no # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -617,18 +477,12 @@ repl-diskless-sync yes # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# When diskless replication is enabled with a delay, it is possible to let -# the replication start before the maximum delay is reached if the maximum -# number of replicas expected have connected. Default of 0 means that the -# maximum is not defined and Redis will wait the full delay. -repl-diskless-sync-max-replicas 0 - # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if you know what you are doing. +# stage with the master. Use only if your do what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -637,23 +491,19 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and replica buffers). +# Copy on Write memory and salve buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep current db contents in RAM while parsing the data directly -# from the socket. Replicas in this mode can keep serving current -# data set while replication is in progress, except for cases where -# they can't recognize master as having a data set from same -# replication history. -# Note that this requires sufficient memory, if you don't have it, -# you risk an OOM kill. +# "swapdb" - Keep a copy of the current db contents in RAM while parsing +# the data directly from the socket. note that this requires +# sufficient memory, if you don't have it, you risk an OOM kill. repl-diskless-load disabled -# Master send PINGs to its replicas in a predefined interval. It's possible to +# Replicas send PINGs to server in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -728,43 +578,6 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 -# The propagation error behavior controls how Redis will behave when it is -# unable to handle a command being processed in the replication stream from a master -# or processed while reading from an AOF file. Errors that occur during propagation -# are unexpected, and can cause data inconsistency. However, there are edge cases -# in earlier versions of Redis where it was possible for the server to replicate or persist -# commands that would fail on future versions. For this reason the default behavior -# is to ignore such errors and continue processing commands. -# -# If an application wants to ensure there is no data divergence, this configuration -# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' -# to only panic when a replica encounters an error on the replication stream. One of -# these two panic values will become the default value in the future once there are -# sufficient safety mechanisms in place to prevent false positive crashes. -# -# propagation-error-behavior ignore - -# Replica ignore disk write errors controls the behavior of a replica when it is -# unable to persist a write command received from its master to disk. By default, -# this configuration is set to 'no' and will crash the replica in this condition. -# It is not recommended to change this default, however in order to be compatible -# with older versions of Redis this config can be toggled to 'yes' which will just -# log a warning and execute the write command it got from the master. -# -# replica-ignore-disk-write-errors no - -# ----------------------------------------------------------------------------- -# By default, Redis Sentinel includes all replicas in its reports. A replica -# can be excluded from Redis Sentinel's announcements. An unannounced replica -# will be ignored by the 'sentinel replicas ' command and won't be -# exposed to Redis Sentinel's clients. -# -# This option does not change the behavior of replica-priority. Even with -# replica-announced set to 'no', the replica can be promoted to master. To -# prevent this behavior, set replica-priority to 0. -# -# replica-announced yes - # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -820,7 +633,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# a radix key indexed by key name, what clients have which keys. In turn +# 16 millions of slots, what clients may have certain subsets of keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -884,12 +697,8 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. -# sanitize-payload RESTORE dump-payload is sanitized (default). -# + Allow the execution of that command. -# May be used with `|` for allowing subcommands (e.g "+config|get") -# - Disallow the execution of that command. -# May be used with `|` for blocking subcommands (e.g "-config|set") +# + Allow the execution of that command +# - Disallow the execution of that command # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -897,11 +706,10 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|first-arg Allow a specific first argument of an otherwise -# disabled command. It is only supported on commands with -# no sub-commands, and is not allowed as negative form -# like -SELECT|1, only additive starting with "+". This -# feature is deprecated and may be removed in the future. +# +|subcommand Allow a specific subcommand of an otherwise +# disabled command. Note that this form is not +# allowed as negative like -DEBUG|SEGFAULT, but +# only additive starting with "+". # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -909,17 +717,8 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read -# from. -# %W~ Add key write pattern that specifies which keys can be -# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. -# & Add a glob-style pattern of Pub/Sub channels that can be -# accessed by the user. It is possible to specify multiple channel -# patterns. -# allchannels Alias for &* -# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -938,14 +737,6 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. -# () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last -# character must be ). -# clearselectors Remove all of the currently attached selectors. -# Note this does not change the "root" user permissions, -# which are the permissions directly applied onto the -# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -967,40 +758,6 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # -# The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata -# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, -# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, -# key or metadata will also have `write` category. Commands that only read -# the keyspace, key or metadata will have the `read` category. -# * read - Reading from keys (values or metadata). Note that commands that don't -# interact with keys, will not have either `read` or `write`. -# * write - Writing to keys (values or metadata) -# * admin - Administrative commands. Normal applications will never need to use -# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. -# * dangerous - Potentially dangerous (each should be considered with care for -# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, -# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. -# * connection - Commands affecting the connection or other connections. -# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. -# * blocking - Potentially blocking the connection until released by another -# command. -# * fast - Fast O(1) commands. May loop on the number of arguments, but not the -# number of elements in the key. -# * slow - All commands that are not Fast. -# * pubsub - PUBLISH / SUBSCRIBE related -# * transaction - WATCH / MULTI / EXEC related commands. -# * scripting - Scripting related. -# * set - Data type: sets related. -# * sortedset - Data type: zsets related. -# * list - Data type: lists related. -# * hash - Data type: hashes related. -# * string - Data type: strings related. -# * bitmap - Data type: bitmaps related. -# * hyperloglog - Data type: hyperloglog related. -# * geo - Data type: geo related. -# * stream - Data type: streams related. -# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -1030,24 +787,8 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# The requirepass is not compatible with aclfile option and the ACL LOAD -# command, these will cause requirepass to be ignored. -# # requirepass foobared -# New users are initialized with restrictive permissions by default, via the -# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it -# is possible to manage access to Pub/Sub channels with ACL rules as well. The -# default Pub/Sub channels permission if new users is controlled by the -# acl-pubsub-default configuration directive, which accepts one of these values: -# -# allchannels: grants access to all Pub/Sub channels -# resetchannels: revokes access to all Pub/Sub channels -# -# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. -# -# acl-pubsub-default resetchannels - # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -1136,12 +877,14 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, when there are no suitable keys for -# eviction, Redis will return an error on write operations that require -# more memory. These are usually commands that create new keys, add data or -# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, -# SORT (due to the STORE argument), and EXEC (if the transaction includes any -# command that requires memory). +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append +# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd +# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby +# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby +# getset mset msetnx exec sort # # The default is: # @@ -1158,14 +901,6 @@ acllog-max-len 128 # # maxmemory-samples 5 -# Eviction processing is designed to function well with the default setting. -# If there is an unusually large amount of write traffic, this value may need to -# be increased. Decreasing this value may reduce latency at the risk of -# eviction processing effectiveness -# 0 = minimum latency, 10 = default, 100 = process without regard to latency -# -# maxmemory-eviction-tenacity 10 - # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -1259,13 +994,6 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous -# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the -# commands. When neither flag is passed, this directive will be used to determine -# if the data should be deleted asynchronously. - -lazyfree-lazy-user-flush no - ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1304,7 +1032,7 @@ lazyfree-lazy-user-flush no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Also, this feature currently does not work when SSL is +# CONFIG SET. Aso this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1322,7 +1050,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports these options: +# Redis supports three options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1343,19 +1071,6 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 - -#################### KERNEL transparent hugepage CONTROL ###################### - -# Usually the kernel Transparent Huge Pages control is set to "madvise" or -# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which -# case this config has no effect. On systems in which it is set to "always", -# redis will attempt to disable it specifically for the redis process in order -# to avoid latency problems specifically with fork(2) and CoW. -# If for some reason you prefer to keep it enabled, you can set this config to -# "no" and the kernel global to "always". - -disable-thp yes - ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1374,43 +1089,14 @@ disable-thp yes # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check https://redis.io/topics/persistence for more information. +# Please check http://redis.io/topics/persistence for more information. appendonly no -# The base name of the append only file. -# -# Redis 7 and newer use a set of append-only files to persist the dataset -# and changes applied to it. There are two basic types of files in use: -# -# - Base files, which are a snapshot representing the complete state of the -# dataset at the time the file was created. Base files can be either in -# the form of RDB (binary serialized) or AOF (textual commands). -# - Incremental files, which contain additional commands that were applied -# to the dataset following the previous file. -# -# In addition, manifest files are used to track the files and the order in -# which they were created and should be applied. -# -# Append-only file names are created by Redis following a specific pattern. -# The file name's prefix is based on the 'appendfilename' configuration -# parameter, followed by additional information about the sequence and type. -# -# For example, if appendfilename is set to appendonly.aof, the following file -# names could be derived: -# -# - appendonly.aof.1.base.rdb as a base file. -# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. -# - appendonly.aof.manifest as a manifest file. +# The name of the append only file (default: "appendonly.aof") appendfilename "appendonly.aof" -# For convenience, Redis stores all persistent append-only files in a dedicated -# directory. The name of the directory is determined by the appenddirname -# configuration parameter. - -appenddirname "appendonlydir" - # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1450,7 +1136,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync no". In practical terms, this means that it is +# the same as "appendfsync none". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1503,69 +1189,34 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# Redis can create append-only base files in either RDB or AOF formats. Using -# the RDB format is always faster and more efficient, and disabling it is only -# supported for backward compatibility purposes. +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading, Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, then continues loading the AOF +# tail. aof-use-rdb-preamble yes -# Redis supports recording timestamp annotations in the AOF to support restoring -# the data from a specific point-in-time. However, using this capability changes -# the AOF format in a way that may not be compatible with existing AOF parsers. -aof-timestamp-enabled no +################################ LUA SCRIPTING ############################### -################################ SHUTDOWN ##################################### - -# Maximum time to wait for replicas when shutting down, in seconds. +# Max execution time of a Lua script in milliseconds. # -# During shut down, a grace period allows any lagging replicas to catch up with -# the latest replication offset before the master exists. This period can -# prevent data loss, especially for deployments without configured disk backups. +# If the maximum execution time is reached Redis will log that a script is +# still in execution after the maximum allowed time and will start to +# reply to queries with an error. # -# The 'shutdown-timeout' value is the grace period's duration in seconds. It is -# only applicable when the instance has replicas. To disable the feature, set -# the value to 0. +# When a long running script exceeds the maximum execution time only the +# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be +# used to stop a script that did not yet call any write commands. The second +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural +# termination of the script. # -# shutdown-timeout 10 - -# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default -# an RDB snapshot is written to disk in a blocking operation if save points are configured. -# The options used on signaled shutdown can include the following values: -# default: Saves RDB snapshot only if save points are configured. -# Waits for lagging replicas to catch up. -# save: Forces a DB saving operation even if no save points are configured. -# nosave: Prevents DB saving operation even if one or more save points are configured. -# now: Skips waiting for lagging replicas. -# force: Ignores any errors that would normally prevent the server from exiting. -# -# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. -# Example: "nosave force now" -# -# shutdown-on-sigint default -# shutdown-on-sigterm default - -################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### - -# Maximum time in milliseconds for EVAL scripts, functions and in some cases -# modules' commands before Redis can start processing or rejecting other clients. -# -# If the maximum execution time is reached Redis will start to reply to most -# commands with a BUSY error. -# -# In this state Redis will only allow a handful of commands to be executed. -# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. -# -# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not -# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop -# the server in the case a write command was already issued by the script when -# the user doesn't want to wait for the natural termination of the script. -# -# The default is 5 seconds. It is possible to set it to 0 or a negative value -# to disable this mechanism (uninterrupted execution). Note that in the past -# this config had a different name, which is now an alias, so both of these do -# the same: -# lua-time-limit 5000 -# busy-reply-threshold 5000 +# Set it to 0 or a negative value for unlimited execution without warnings. +lua-time-limit 5000 ################################ REDIS CLUSTER ############################### @@ -1589,11 +1240,6 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires -# you to specify the cluster bus port when executing cluster meet. -# cluster-port 0 - # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1652,21 +1298,12 @@ aof-timestamp-enabled no # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value or -# set cluster-allow-replica-migration to 'no'. +# one replica). To disable migration just set it to a very large value. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 -# Turning off this option allows to use less automatic cluster configuration. -# It both disables migration to orphaned masters and migration from masters -# that became empty. -# -# Default is 'yes' (allow automatic migrations). -# -# cluster-allow-replica-migration yes - # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1681,7 +1318,7 @@ aof-timestamp-enabled no # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the replica can still perform a +# master during master failures. However the master can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1691,7 +1328,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1706,54 +1343,8 @@ aof-timestamp-enabled no # # cluster-allow-reads-when-down no -# This option, when set to yes, allows nodes to serve pubsub shard traffic while -# the cluster is in a down state, as long as it believes it owns the slots. -# -# This is useful if the application would like to use the pubsub feature even when -# the cluster global stable state is not OK. If the application wants to make sure only -# one shard is serving a given channel, this feature should be kept as yes. -# -# cluster-allow-pubsubshard-when-down yes - -# Cluster link send buffer limit is the limit on the memory usage of an individual -# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed -# this limit. This is to primarily prevent send buffers from growing unbounded on links -# toward slow peers (E.g. PubSub messages being piled up). -# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field -# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. -# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single -# PubSub message by default. (client-query-buffer-limit default value is 1gb) -# -# cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for -# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based -# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propagate the removal. -# -# cluster-announce-hostname "" - -# Clusters can advertise how clients should connect to them using either their IP address, -# a user defined hostname, or by declaring they have no endpoint. Which endpoint is -# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type -# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' -# will be returned instead. -# -# When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the -# server doesn't know which one the client took. In this case, the server is expecting -# the client to reach out on the same endpoint it used for making the last request, but use -# the port provided in the response. -# -# cluster-preferred-endpoint-type ip - # In order to setup your cluster make sure to read the documentation -# available at https://redis.io web site. +# available at http://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1763,21 +1354,16 @@ aof-timestamp-enabled no # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following four options are used for this scope, and are: +# following two options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port -# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client ports (for connections -# without and with TLS) and cluster message bus port. The information is then -# published in the header of the bus packets so that other nodes will be able to -# correctly map the address of the node publishing the information. -# -# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set -# to zero, then cluster-announce-port refers to the TLS port. Note also that -# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# Each instructs the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1790,8 +1376,7 @@ aof-timestamp-enabled no # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-tls-port 6379 -# cluster-announce-port 0 +# cluster-announce-port 6379 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1839,24 +1424,10 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 -################################ LATENCY TRACKING ############################## - -# The Redis extended latency monitoring tracks the per command latencies and enables -# exporting the percentile distribution via the INFO latencystats command, -# and cumulative latency distributions (histograms) via the LATENCY command. -# -# By default, the extended latency monitoring is enabled since the overhead -# of keeping track of the command latency is very small. -# latency-tracking yes - -# By default the exported latency percentiles via the INFO latencystats command -# are the p50, p99, and p999. -# latency-tracking-info-percentiles 50 99 99.9 - ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at https://redis.io/topics/notifications +# This feature is documented at http://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1878,11 +1449,9 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) -# n New key events (Note: not included in the 'A' class) # t Stream commands -# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# A Alias for g$lshzxet, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1905,13 +1474,71 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" +############################### GOPHER SERVER ################################# + +# Redis contains an implementation of the Gopher protocol, as specified in +# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). +# +# The Gopher protocol was very popular in the late '90s. It is an alternative +# to the web, and the implementation both server and client side is so simple +# that the Redis server has just 100 lines of code in order to implement this +# support. +# +# What do you do with Gopher nowadays? Well Gopher never *really* died, and +# lately there is a movement in order for the Gopher more hierarchical content +# composed of just plain text documents to be resurrected. Some want a simpler +# internet, others believe that the mainstream internet became too much +# controlled, and it's cool to create an alternative space for people that +# want a bit of fresh air. +# +# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol +# as a gift. +# +# --- HOW IT WORKS? --- +# +# The Redis Gopher support uses the inline protocol of Redis, and specifically +# two kind of inline requests that were anyway illegal: an empty request +# or any request that starts with "/" (there are no Redis commands starting +# with such a slash). Normal RESP2/RESP3 requests are completely out of the +# path of the Gopher protocol implementation and are served as usual as well. +# +# If you open a connection to Redis when Gopher is enabled and send it +# a string like "/foo", if there is a key named "/foo" it is served via the +# Gopher protocol. +# +# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher +# talking), you likely need a script like the following: +# +# https://github.com/antirez/gopher2redis +# +# --- SECURITY WARNING --- +# +# If you plan to put Redis on the internet in a publicly accessible address +# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. +# Once a password is set: +# +# 1. The Gopher server (when enabled, not by default) will still serve +# content via Gopher. +# 2. However other commands cannot be called before the client will +# authenticate. +# +# So use the 'requirepass' option to protect your instance. +# +# Note that Gopher is not currently supported when 'io-threads-do-reads' +# is enabled. +# +# To enable Gopher support, uncomment the following line and set the option +# from no (the default) to yes. +# +# gopher-enabled no + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-listpack-entries 512 -hash-max-listpack-value 64 +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1926,7 +1553,7 @@ hash-max-listpack-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-listpack-size -2 +list-max-ziplist-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1954,8 +1581,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-listpack-entries 128 -zset-max-listpack-value 64 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1977,7 +1604,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entries limit by setting max-bytes to 0 and max-entries to the desired +# max entires limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -2010,7 +1637,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2034,13 +1661,6 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # -# Note that it doesn't make sense to set the replica clients output buffer -# limit lower than the repl-backlog-size config (partial sync will succeed -# and then replica will get disconnected). -# Such a configuration is ignored (the size of repl-backlog-size will be used). -# This doesn't have memory consumption implications since the replica client -# will share the backlog buffers memory. -# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -2054,25 +1674,6 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb -# In some scenarios client connections can hog up memory leading to OOM -# errors or data eviction. To avoid this we can cap the accumulated memory -# used by all client connections (all pubsub and normal clients). Once we -# reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most -# memory first. We call this mechanism "client eviction". -# -# Client eviction is configured using the maxmemory-clients setting as follows: -# 0 - client eviction is disabled (default) -# -# A memory value can be used for the client eviction threshold, -# for example: -# maxmemory-clients 1g -# -# A percentage value (between 1% and 100%) means the client eviction threshold -# is based on a percentage of the maxmemory setting. For example to set client -# eviction at 5% of maxmemory: -# maxmemory-clients 5% - # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -2113,13 +1714,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -2216,7 +1817,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Active defragmentation is disabled by default +# Enabled active defragmentation # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis/docker-compose.yml b/dockge/redis/docker-compose.yml index fe930bde8..414c1b027 100644 --- a/dockge/redis/docker-compose.yml +++ b/dockge/redis/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:7.4.6-alpine + image: redis:6.2.20-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_6_2_20/.env b/dockge/redis_7_4_6/.env similarity index 100% rename from dockge/redis_6_2_20/.env rename to dockge/redis_7_4_6/.env diff --git a/dockge/redis_6_2_20/config/redis.conf b/dockge/redis_7_4_6/config/redis.conf similarity index 72% rename from dockge/redis_6_2_20/config/redis.conf rename to dockge/redis_7_4_6/config/redis.conf index ca22ec9f6..8795ae291 100644 --- a/dockge/redis_6_2_20/config/redis.conf +++ b/dockge/redis_7_4_6/config/redis.conf @@ -32,8 +32,17 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# # include /path/to/local.conf # include /path/to/other.conf +# include /path/to/fragments/*.conf +# ################################## MODULES ##################################### @@ -49,43 +58,81 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 -# bind 127.0.0.1 ::1 +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 loopback interface address (this means Redis will only be able to -# accept client connections from the same host that it is running on). +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# JUST COMMENT OUT THE FOLLOWING LINE. +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and if: -# -# 1) The server is not binding explicitly to a set of addresses using the -# "bind" directive. -# 2) No password is configured. -# -# The server only accepts connections from clients connecting from the -# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain -# sockets. +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured, nor a specific set of interfaces -# are explicitly listed using the "bind" directive. +# even if no authentication is configured. protected-mode yes +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -105,7 +152,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /tmp/redis.sock +# unixsocket /run/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -128,6 +175,16 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -143,8 +200,32 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. # # tls-dh-params-file redis.dh @@ -177,9 +258,12 @@ tcp-keepalive 300 # # tls-cluster yes -# Explicitly specify TLS versions to support. Allowed values are case insensitive -# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -221,6 +305,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -229,11 +314,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -244,6 +335,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -269,44 +363,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -338,6 +462,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -412,9 +551,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -463,7 +603,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -477,12 +617,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -491,19 +637,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -578,6 +728,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -633,7 +820,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -697,8 +884,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -706,10 +897,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -717,8 +909,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -737,6 +938,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -758,6 +967,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -787,8 +1030,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -877,14 +1136,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -901,6 +1158,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -994,6 +1259,13 @@ replica-lazy-flush no lazyfree-lazy-user-del no +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1032,7 +1304,7 @@ lazyfree-lazy-user-del no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1050,7 +1322,7 @@ lazyfree-lazy-user-del no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1071,6 +1343,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1089,14 +1374,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1136,7 +1450,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1189,34 +1503,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1240,6 +1589,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1298,12 +1652,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1318,7 +1681,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1328,7 +1691,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1343,8 +1706,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1354,16 +1763,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1376,7 +1790,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1424,10 +1839,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1449,9 +1878,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1474,71 +1905,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1553,7 +1926,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1581,8 +1954,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1604,7 +1977,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1637,7 +2010,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1661,6 +2034,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1674,6 +2054,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1714,13 +2113,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1817,7 +2216,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis_6_2_20/docker-compose.yml b/dockge/redis_7_4_6/docker-compose.yml similarity index 94% rename from dockge/redis_6_2_20/docker-compose.yml rename to dockge/redis_7_4_6/docker-compose.yml index 414c1b027..fe930bde8 100644 --- a/dockge/redis_6_2_20/docker-compose.yml +++ b/dockge/redis_7_4_6/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:6.2.20-alpine + image: redis:7.4.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_6_2_20/envs/default.env b/dockge/redis_7_4_6/envs/default.env similarity index 100% rename from dockge/redis_6_2_20/envs/default.env rename to dockge/redis_7_4_6/envs/default.env diff --git a/dockge/redis_6_2_20/envs/global.env b/dockge/redis_7_4_6/envs/global.env similarity index 100% rename from dockge/redis_6_2_20/envs/global.env rename to dockge/redis_7_4_6/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_main/.env b/dockge/stream-rec-backend_0_7_2/.env similarity index 100% rename from dockge/stream-rec-backend_main/.env rename to dockge/stream-rec-backend_0_7_2/.env diff --git a/dockge/stream-rec-backend_main/docker-compose.yml b/dockge/stream-rec-backend_0_7_2/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_main/docker-compose.yml rename to dockge/stream-rec-backend_0_7_2/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend_main/docker-compose.yml +++ b/dockge/stream-rec-backend_0_7_2/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_main/envs/default.env b/dockge/stream-rec-backend_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_main/envs/default.env rename to dockge/stream-rec-backend_0_7_2/envs/default.env diff --git a/dockge/stream-rec-backend_main/envs/global.env b/dockge/stream-rec-backend_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_main/envs/global.env rename to dockge/stream-rec-backend_0_7_2/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_main/.env b/dockge/stream-rec-frontend_0_7_2/.env similarity index 100% rename from dockge/stream-rec-frontend_main/.env rename to dockge/stream-rec-frontend_0_7_2/.env diff --git a/dockge/stream-rec-frontend_main/docker-compose.yml b/dockge/stream-rec-frontend_0_7_2/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_main/docker-compose.yml rename to dockge/stream-rec-frontend_0_7_2/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend_main/docker-compose.yml +++ b/dockge/stream-rec-frontend_0_7_2/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_main/envs/default.env b/dockge/stream-rec-frontend_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_main/envs/default.env rename to dockge/stream-rec-frontend_0_7_2/envs/default.env diff --git a/dockge/stream-rec-frontend_main/envs/global.env b/dockge/stream-rec-frontend_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_main/envs/global.env rename to dockge/stream-rec-frontend_0_7_2/envs/global.env diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 03a278089..8465b7136 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_dev/.env b/dockge/stream-rec_0_7_2/.env similarity index 100% rename from dockge/stream-rec_dev/.env rename to dockge/stream-rec_0_7_2/.env diff --git a/dockge/stream-rec_dev/docker-compose.yml b/dockge/stream-rec_0_7_2/docker-compose.yml similarity index 92% rename from dockge/stream-rec_dev/docker-compose.yml rename to dockge/stream-rec_0_7_2/docker-compose.yml index 8465b7136..03a278089 100644 --- a/dockge/stream-rec_dev/docker-compose.yml +++ b/dockge/stream-rec_0_7_2/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:dev + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:dev + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_dev/envs/default.env b/dockge/stream-rec_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec_dev/envs/default.env rename to dockge/stream-rec_0_7_2/envs/default.env diff --git a/dockge/stream-rec_dev/envs/global.env b/dockge/stream-rec_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec_dev/envs/global.env rename to dockge/stream-rec_0_7_2/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 32a291fcd..5fa74c158 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,3 +4,9 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= + +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false + diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env deleted file mode 100644 index 5fa74c158..000000000 --- a/dockge/uptime-kuma_1_23_16/.env +++ /dev/null @@ -1,12 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env new file mode 100644 index 000000000..32a291fcd --- /dev/null +++ b/dockge/uptime-kuma_2_0_0/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + diff --git a/dockge/uptime-kuma_1_23_16/docker-compose.yml b/dockge/uptime-kuma_2_0_0/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_1_23_16/docker-compose.yml rename to dockge/uptime-kuma_2_0_0/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma_1_23_16/docker-compose.yml +++ b/dockge/uptime-kuma_2_0_0/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/envs/default.env b/dockge/uptime-kuma_2_0_0/envs/default.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/default.env rename to dockge/uptime-kuma_2_0_0/envs/default.env diff --git a/dockge/uptime-kuma_1_23_16/envs/global.env b/dockge/uptime-kuma_2_0_0/envs/global.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/global.env rename to dockge/uptime-kuma_2_0_0/envs/global.env From 5e6ccdad08cba88965717e770c33fb6259a82bf1 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 17 Oct 2025 09:23:17 +0000 Subject: [PATCH 199/262] Processed apps directory via GitHub Actions --- dockge/affine/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-aria2/.env | 2 +- dockge/alist-aria2/docker-compose.yml | 6 +- .../{alist_3_45_0 => alist-aria2_4_0_2}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist-ffmpeg/.env | 2 +- dockge/alist-ffmpeg/docker-compose.yml | 6 +- .../.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist/.env | 2 +- dockge/alist/docker-compose.yml | 6 +- .../{alist-ffmpeg_3_45_0 => alist_4_0_2}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/archivebox/docker-compose.yml | 24 +- .../.env | 0 .../docker-compose.yml | 24 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/baota/docker-compose.yml | 2 +- dockge/{baota_9_0 => baota_10_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../{baota_9_0 => baota_10_0}/envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/emby/docker-compose.yml | 2 +- dockge/{emby_4_9_2_4 => emby_4_8_11_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/homarr/.env | 2 +- dockge/homarr/docker-compose.yml | 2 +- dockge/{homarr_1_41_0 => homarr_0_16_0}/.env | 2 +- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/iyuu-plus/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/minio/.env | 5 +- dockge/minio/docker-compose.yml | 6 +- .../.env | 5 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/moontv/.env | 3 - dockge/moontv/docker-compose.yml | 2 +- dockge/{moontv_latest => moontv_4_3_0}/.env | 3 + .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql/config/my.cnf | 34 +- dockge/mysql/docker-compose.yml | 11 +- dockge/mysql_5_7_44/config/my.cnf | 42 - dockge/{mysql_5_7_44 => mysql_8_4_6}/.env | 0 dockge/mysql_8_4_6/config/my.cnf | 20 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/nacos/docker-compose.yml | 2 +- dockge/{nacos_2_4_3 => nacos_2_5_1}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 0 dockge/postgresql-postgis/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/qbittorrent/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/redis/config/redis.conf | 759 +++++++++++++----- dockge/redis/docker-compose.yml | 2 +- dockge/{redis_7_4_6 => redis_6_2_20}/.env | 0 .../config/redis.conf | 759 +++++------------- .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-backend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec-frontend/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/stream-rec/docker-compose.yml | 4 +- .../{stream-rec_0_7_2 => stream-rec_dev}/.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma/.env | 6 - dockge/uptime-kuma/docker-compose.yml | 11 +- dockge/uptime-kuma_1_23_16/.env | 12 + .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma_2_0_0/.env | 6 - 140 files changed, 945 insertions(+), 945 deletions(-) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/.env (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/docker-compose.yml (94%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/envs/default.env (100%) rename dockge/{affine_stable-e98f035 => affine_stable-1623f5d}/envs/global.env (100%) rename dockge/{alist_3_45_0 => alist-aria2_4_0_2}/.env (93%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/docker-compose.yml (85%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/envs/default.env (100%) rename dockge/{alist-aria2_3_40_0 => alist-aria2_4_0_2}/envs/global.env (100%) rename dockge/{alist-aria2_3_40_0 => alist-ffmpeg_4_0_2}/.env (93%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/docker-compose.yml (85%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/envs/default.env (100%) rename dockge/{alist-ffmpeg_3_45_0 => alist-ffmpeg_4_0_2}/envs/global.env (100%) rename dockge/{alist-ffmpeg_3_45_0 => alist_4_0_2}/.env (93%) rename dockge/{alist_3_45_0 => alist_4_0_2}/docker-compose.yml (86%) rename dockge/{alist_3_45_0 => alist_4_0_2}/envs/default.env (100%) rename dockge/{alist_3_45_0 => alist_4_0_2}/envs/global.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/docker-compose.yml (60%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/envs/default.env (100%) rename dockge/{archivebox_0_8_5rc51 => archivebox_0_7_3}/envs/global.env (100%) rename dockge/{baota_9_0 => baota_10_0}/.env (100%) rename dockge/{baota_9_0 => baota_10_0}/docker-compose.yml (92%) rename dockge/{baota_9_0 => baota_10_0}/envs/default.env (100%) rename dockge/{baota_9_0 => baota_10_0}/envs/global.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/categories.json (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/config/template.html (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/docker-compose.yml (88%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/envs/default.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_8}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_9_1_5 => elastic-elasticsearch_8_19_5}/envs/global.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/docker-compose.yml (95%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/envs/default.env (100%) rename dockge/{elastic-kibana_9_1_5 => elastic-kibana_8_19_5}/envs/global.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/docker-compose.yml (96%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/envs/default.env (100%) rename dockge/{emby_4_9_2_4 => emby_4_8_11_0}/envs/global.env (100%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/.env (67%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/docker-compose.yml (89%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/envs/default.env (100%) rename dockge/{homarr_1_41_0 => homarr_0_16_0}/envs/global.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/docker-compose.yml (95%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/envs/default.env (100%) rename dockge/{iyuu-plus_latest => iyuu-plus_latest-mysql}/envs/global.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/.env (86%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/docker-compose.yml (83%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/envs/default.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-09-07}/envs/global.env (100%) rename dockge/{moontv_latest => moontv_4_3_0}/.env (95%) rename dockge/{moontv_latest => moontv_4_3_0}/docker-compose.yml (87%) rename dockge/{moontv_latest => moontv_4_3_0}/envs/default.env (100%) rename dockge/{moontv_latest => moontv_4_3_0}/envs/global.env (100%) delete mode 100644 dockge/mysql_5_7_44/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_6}/.env (100%) create mode 100644 dockge/mysql_8_4_6/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_6}/docker-compose.yml (65%) rename dockge/{mysql_5_7_44 => mysql_8_4_6}/envs/default.env (100%) rename dockge/{mysql_5_7_44 => mysql_8_4_6}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/docker-compose.yml (94%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/envs/default.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_1}/init/mysql-schema.sql (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/.env (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/docker-compose.yml (94%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/envs/default.env (100%) rename dockge/{postgresql-postgis_16-3_5 => postgresql-postgis_17-3_5}/envs/global.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/docker-compose.yml (89%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/envs/default.env (100%) rename dockge/{postgresql_17_6-alpine => postgresql_pg14}/envs/global.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/docker-compose.yml (95%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/envs/default.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_2}/envs/global.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/config/redis.conf (72%) rename dockge/{redis_7_4_6 => redis_6_2_20}/docker-compose.yml (94%) rename dockge/{redis_7_4_6 => redis_6_2_20}/envs/default.env (100%) rename dockge/{redis_7_4_6 => redis_6_2_20}/envs/global.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/docker-compose.yml (92%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/envs/default.env (100%) rename dockge/{stream-rec-backend_0_7_2 => stream-rec-backend_main}/envs/global.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/docker-compose.yml (87%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/envs/default.env (100%) rename dockge/{stream-rec-frontend_0_7_2 => stream-rec-frontend_main}/envs/global.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/docker-compose.yml (92%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/envs/default.env (100%) rename dockge/{stream-rec_0_7_2 => stream-rec_dev}/envs/global.env (100%) create mode 100644 dockge/uptime-kuma_1_23_16/.env rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/docker-compose.yml (57%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/default.env (100%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/global.env (100%) delete mode 100644 dockge/uptime-kuma_2_0_0/.env diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/.env b/dockge/affine_stable-1623f5d/.env similarity index 100% rename from dockge/affine_stable-e98f035/.env rename to dockge/affine_stable-1623f5d/.env diff --git a/dockge/affine_stable-e98f035/docker-compose.yml b/dockge/affine_stable-1623f5d/docker-compose.yml similarity index 94% rename from dockge/affine_stable-e98f035/docker-compose.yml rename to dockge/affine_stable-1623f5d/docker-compose.yml index 94a383ee2..18926413f 100644 --- a/dockge/affine_stable-e98f035/docker-compose.yml +++ b/dockge/affine_stable-1623f5d/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/envs/default.env b/dockge/affine_stable-1623f5d/envs/default.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/default.env rename to dockge/affine_stable-1623f5d/envs/default.env diff --git a/dockge/affine_stable-e98f035/envs/global.env b/dockge/affine_stable-1623f5d/envs/global.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/global.env rename to dockge/affine_stable-1623f5d/envs/global.env diff --git a/dockge/alist-aria2/.env b/dockge/alist-aria2/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-aria2/.env +++ b/dockge/alist-aria2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index d11a2d481..a6913980a 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist-aria2: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-aria2 + image: qyg2297248353/alist-aria2:v3.40.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_3_45_0/.env b/dockge/alist-aria2_4_0_2/.env similarity index 93% rename from dockge/alist_3_45_0/.env rename to dockge/alist-aria2_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist_3_45_0/.env +++ b/dockge/alist-aria2_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-aria2_3_40_0/docker-compose.yml b/dockge/alist-aria2_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-aria2_3_40_0/docker-compose.yml rename to dockge/alist-aria2_4_0_2/docker-compose.yml index a6913980a..d11a2d481 100644 --- a/dockge/alist-aria2_3_40_0/docker-compose.yml +++ b/dockge/alist-aria2_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist-aria2: + openlist: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist-aria2:v3.40.0 + image: openlistteam/openlist:v4.0.2-aria2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_3_40_0/envs/default.env b/dockge/alist-aria2_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-aria2_3_40_0/envs/default.env rename to dockge/alist-aria2_4_0_2/envs/default.env diff --git a/dockge/alist-aria2_3_40_0/envs/global.env b/dockge/alist-aria2_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-aria2_3_40_0/envs/global.env rename to dockge/alist-aria2_4_0_2/envs/global.env diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index ded9a5b7e..37149a612 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-aria2_3_40_0/.env b/dockge/alist-ffmpeg_4_0_2/.env similarity index 93% rename from dockge/alist-aria2_3_40_0/.env rename to dockge/alist-ffmpeg_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-aria2_3_40_0/.env +++ b/dockge/alist-ffmpeg_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_3_45_0/docker-compose.yml rename to dockge/alist-ffmpeg_4_0_2/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml +++ b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: openlistteam/openlist:v4.0.2-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_3_45_0/envs/default.env b/dockge/alist-ffmpeg_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/default.env rename to dockge/alist-ffmpeg_4_0_2/envs/default.env diff --git a/dockge/alist-ffmpeg_3_45_0/envs/global.env b/dockge/alist-ffmpeg_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/global.env rename to dockge/alist-ffmpeg_4_0_2/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist-ffmpeg_3_45_0/.env b/dockge/alist_4_0_2/.env similarity index 93% rename from dockge/alist-ffmpeg_3_45_0/.env rename to dockge/alist_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg_3_45_0/.env +++ b/dockge/alist_4_0_2/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist_3_45_0/docker-compose.yml b/dockge/alist_4_0_2/docker-compose.yml similarity index 86% rename from dockge/alist_3_45_0/docker-compose.yml rename to dockge/alist_4_0_2/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist_3_45_0/docker-compose.yml +++ b/dockge/alist_4_0_2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: openlistteam/openlist:v4.0.2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/alist_3_45_0/envs/default.env b/dockge/alist_4_0_2/envs/default.env similarity index 100% rename from dockge/alist_3_45_0/envs/default.env rename to dockge/alist_4_0_2/envs/default.env diff --git a/dockge/alist_3_45_0/envs/global.env b/dockge/alist_4_0_2/envs/global.env similarity index 100% rename from dockge/alist_3_45_0/envs/global.env rename to dockge/alist_4_0_2/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index f70ce3cc2..ac22205db 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: archivebox: container_name: archivebox + depends_on: + - archivebox-init env_file: - ./envs/global.env - .env @@ -14,7 +16,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.7.3 + image: archivebox/archivebox:0.8.5rc51 labels: createdBy: Apps networks: @@ -24,6 +26,26 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data + archivebox-init: + command: archivebox init + container_name: init-archivebox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - ALLOWED_HOSTS=* + - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - SEARCH_BACKEND_ENGINE=sonic + - SEARCH_BACKEND_HOST_NAME=archivebox-sonic + - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} + image: archivebox/archivebox:0.8.5rc51 + labels: + createdBy: Apps + networks: + - 1panel-network + volumes: + - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_8_5rc51/.env b/dockge/archivebox_0_7_3/.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/.env rename to dockge/archivebox_0_7_3/.env diff --git a/dockge/archivebox_0_8_5rc51/docker-compose.yml b/dockge/archivebox_0_7_3/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_8_5rc51/docker-compose.yml rename to dockge/archivebox_0_7_3/docker-compose.yml index ac22205db..f70ce3cc2 100644 --- a/dockge/archivebox_0_8_5rc51/docker-compose.yml +++ b/dockge/archivebox_0_7_3/docker-compose.yml @@ -4,8 +4,6 @@ networks: services: archivebox: container_name: archivebox - depends_on: - - archivebox-init env_file: - ./envs/global.env - .env @@ -16,7 +14,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 + image: archivebox/archivebox:0.7.3 labels: createdBy: Apps networks: @@ -26,26 +24,6 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data - archivebox-init: - command: archivebox init - container_name: init-archivebox - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - ALLOWED_HOSTS=* - - CSRF_TRUSTED_ORIGINS=http://localhost:8000 - - SEARCH_BACKEND_ENGINE=sonic - - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc51 - labels: - createdBy: Apps - networks: - - 1panel-network - volumes: - - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_8_5rc51/envs/default.env b/dockge/archivebox_0_7_3/envs/default.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/envs/default.env rename to dockge/archivebox_0_7_3/envs/default.env diff --git a/dockge/archivebox_0_8_5rc51/envs/global.env b/dockge/archivebox_0_7_3/envs/global.env similarity index 100% rename from dockge/archivebox_0_8_5rc51/envs/global.env rename to dockge/archivebox_0_7_3/envs/global.env diff --git a/dockge/baota/docker-compose.yml b/dockge/baota/docker-compose.yml index 678152df3..c28254802 100644 --- a/dockge/baota/docker-compose.yml +++ b/dockge/baota/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:10.0_lts + image: btpanel/baota:9.0_lts_latest labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_9_0/.env b/dockge/baota_10_0/.env similarity index 100% rename from dockge/baota_9_0/.env rename to dockge/baota_10_0/.env diff --git a/dockge/baota_9_0/docker-compose.yml b/dockge/baota_10_0/docker-compose.yml similarity index 92% rename from dockge/baota_9_0/docker-compose.yml rename to dockge/baota_10_0/docker-compose.yml index c28254802..678152df3 100644 --- a/dockge/baota_9_0/docker-compose.yml +++ b/dockge/baota_10_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - 3306 - 80 - 443 - image: btpanel/baota:9.0_lts_latest + image: btpanel/baota:10.0_lts labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/baota_9_0/envs/default.env b/dockge/baota_10_0/envs/default.env similarity index 100% rename from dockge/baota_9_0/envs/default.env rename to dockge/baota_10_0/envs/default.env diff --git a/dockge/baota_9_0/envs/global.env b/dockge/baota_10_0/envs/global.env similarity index 100% rename from dockge/baota_9_0/envs/global.env rename to dockge/baota_10_0/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index af4782f89..c68c76b14 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.8 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.8 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/.env b/dockge/bili-fetcher_1_6_8/.env similarity index 100% rename from dockge/bili-fetcher_latest/.env rename to dockge/bili-fetcher_1_6_8/.env diff --git a/dockge/bili-fetcher_latest/config/categories.json b/dockge/bili-fetcher_1_6_8/config/categories.json similarity index 100% rename from dockge/bili-fetcher_latest/config/categories.json rename to dockge/bili-fetcher_1_6_8/config/categories.json diff --git a/dockge/bili-fetcher_latest/config/config.yaml b/dockge/bili-fetcher_1_6_8/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/config.yaml rename to dockge/bili-fetcher_1_6_8/config/config.yaml diff --git a/dockge/bili-fetcher_latest/config/scheduler_config.yaml b/dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/scheduler_config.yaml rename to dockge/bili-fetcher_1_6_8/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_latest/config/sql_statements_mysql.py b/dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_mysql.py rename to dockge/bili-fetcher_1_6_8/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py b/dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_1_6_8/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_latest/config/template.html b/dockge/bili-fetcher_1_6_8/config/template.html similarity index 100% rename from dockge/bili-fetcher_latest/config/template.html rename to dockge/bili-fetcher_1_6_8/config/template.html diff --git a/dockge/bili-fetcher_latest/docker-compose.yml b/dockge/bili-fetcher_1_6_8/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_latest/docker-compose.yml rename to dockge/bili-fetcher_1_6_8/docker-compose.yml index c68c76b14..af4782f89 100644 --- a/dockge/bili-fetcher_latest/docker-compose.yml +++ b/dockge/bili-fetcher_1_6_8/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.8 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.8 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/envs/default.env b/dockge/bili-fetcher_1_6_8/envs/default.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/default.env rename to dockge/bili-fetcher_1_6_8/envs/default.env diff --git a/dockge/bili-fetcher_latest/envs/global.env b/dockge/bili-fetcher_1_6_8/envs/global.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/global.env rename to dockge/bili-fetcher_1_6_8/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index d618229ca..095cf8284 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.5 + image: elasticsearch:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_5/.env b/dockge/elastic-elasticsearch_8_19_5/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/.env rename to dockge/elastic-elasticsearch_8_19_5/.env diff --git a/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml b/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_1_5/docker-compose.yml rename to dockge/elastic-elasticsearch_8_19_5/docker-compose.yml index 095cf8284..d618229ca 100644 --- a/dockge/elastic-elasticsearch_9_1_5/docker-compose.yml +++ b/dockge/elastic-elasticsearch_8_19_5/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.1.5 + image: elasticsearch:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_5/envs/default.env b/dockge/elastic-elasticsearch_8_19_5/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/envs/default.env rename to dockge/elastic-elasticsearch_8_19_5/envs/default.env diff --git a/dockge/elastic-elasticsearch_9_1_5/envs/global.env b/dockge/elastic-elasticsearch_8_19_5/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_5/envs/global.env rename to dockge/elastic-elasticsearch_8_19_5/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index c7d0828cd..1a784d0e3 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.19.5 + image: kibana:9.1.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_5/.env b/dockge/elastic-kibana_8_19_5/.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/.env rename to dockge/elastic-kibana_8_19_5/.env diff --git a/dockge/elastic-kibana_9_1_5/docker-compose.yml b/dockge/elastic-kibana_8_19_5/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_9_1_5/docker-compose.yml rename to dockge/elastic-kibana_8_19_5/docker-compose.yml index 1a784d0e3..c7d0828cd 100644 --- a/dockge/elastic-kibana_9_1_5/docker-compose.yml +++ b/dockge/elastic-kibana_8_19_5/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.1.5 + image: kibana:8.19.5 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_5/envs/default.env b/dockge/elastic-kibana_8_19_5/envs/default.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/envs/default.env rename to dockge/elastic-kibana_8_19_5/envs/default.env diff --git a/dockge/elastic-kibana_9_1_5/envs/global.env b/dockge/elastic-kibana_8_19_5/envs/global.env similarity index 100% rename from dockge/elastic-kibana_9_1_5/envs/global.env rename to dockge/elastic-kibana_8_19_5/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index a461e63ac..1e9567477 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.2.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_4/.env b/dockge/emby_4_8_11_0/.env similarity index 100% rename from dockge/emby_4_9_2_4/.env rename to dockge/emby_4_8_11_0/.env diff --git a/dockge/emby_4_9_2_4/docker-compose.yml b/dockge/emby_4_8_11_0/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_2_4/docker-compose.yml rename to dockge/emby_4_8_11_0/docker-compose.yml index 1e9567477..a461e63ac 100644 --- a/dockge/emby_4_9_2_4/docker-compose.yml +++ b/dockge/emby_4_8_11_0/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_2_4/envs/default.env b/dockge/emby_4_8_11_0/envs/default.env similarity index 100% rename from dockge/emby_4_9_2_4/envs/default.env rename to dockge/emby_4_8_11_0/envs/default.env diff --git a/dockge/emby_4_9_2_4/envs/global.env b/dockge/emby_4_8_11_0/envs/global.env similarity index 100% rename from dockge/emby_4_9_2_4/envs/global.env rename to dockge/emby_4_8_11_0/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 9370b8091..4610427ed 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 8568f94b3..06b42b32c 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.0 + image: ghcr.io/homarr-labs/homarr:v1.41.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_41_0/.env b/dockge/homarr_0_16_0/.env similarity index 67% rename from dockge/homarr_1_41_0/.env rename to dockge/homarr_0_16_0/.env index 4610427ed..9370b8091 100644 --- a/dockge/homarr_1_41_0/.env +++ b/dockge/homarr_0_16_0/.env @@ -8,5 +8,5 @@ HOMARR_ROOT_PATH=/home/homarr PANEL_APP_PORT_HTTP=7575 # 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 diff --git a/dockge/homarr_1_41_0/docker-compose.yml b/dockge/homarr_0_16_0/docker-compose.yml similarity index 89% rename from dockge/homarr_1_41_0/docker-compose.yml rename to dockge/homarr_0_16_0/docker-compose.yml index 06b42b32c..8568f94b3 100644 --- a/dockge/homarr_1_41_0/docker-compose.yml +++ b/dockge/homarr_0_16_0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/ajnart/homarr:0.16.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/homarr_1_41_0/envs/default.env b/dockge/homarr_0_16_0/envs/default.env similarity index 100% rename from dockge/homarr_1_41_0/envs/default.env rename to dockge/homarr_0_16_0/envs/default.env diff --git a/dockge/homarr_1_41_0/envs/global.env b/dockge/homarr_0_16_0/envs/global.env similarity index 100% rename from dockge/homarr_1_41_0/envs/global.env rename to dockge/homarr_0_16_0/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus/docker-compose.yml +++ b/dockge/iyuu-plus/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus:latest + image: iyuucn/iyuuplus-nodb:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/.env b/dockge/iyuu-plus_latest-mysql/.env similarity index 100% rename from dockge/iyuu-plus_latest/.env rename to dockge/iyuu-plus_latest-mysql/.env diff --git a/dockge/iyuu-plus_latest/docker-compose.yml b/dockge/iyuu-plus_latest-mysql/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest/docker-compose.yml rename to dockge/iyuu-plus_latest-mysql/docker-compose.yml index 39b4c1ba0..142aaa4d5 100644 --- a/dockge/iyuu-plus_latest/docker-compose.yml +++ b/dockge/iyuu-plus_latest-mysql/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/envs/default.env b/dockge/iyuu-plus_latest-mysql/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/default.env rename to dockge/iyuu-plus_latest-mysql/envs/default.env diff --git a/dockge/iyuu-plus_latest/envs/global.env b/dockge/iyuu-plus_latest-mysql/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/global.env rename to dockge/iyuu-plus_latest-mysql/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.env @@ -4,12 +4,9 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 (映射内部端口) [必填] +# API 端口 [必填] PANEL_APP_PORT_API=9000 -# API 内部端口 [必填] -MINIO_API_PORT=9000 - # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/.env b/dockge/minio_2025-09-07/.env similarity index 86% rename from dockge/minio_2025-04-22/.env rename to dockge/minio_2025-09-07/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio_2025-04-22/.env +++ b/dockge/minio_2025-09-07/.env @@ -4,9 +4,12 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 [必填] +# API 端口 (映射内部端口) [必填] PANEL_APP_PORT_API=9000 +# API 内部端口 [必填] +MINIO_API_PORT=9000 + # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio_2025-04-22/docker-compose.yml b/dockge/minio_2025-09-07/docker-compose.yml similarity index 83% rename from dockge/minio_2025-04-22/docker-compose.yml rename to dockge/minio_2025-09-07/docker-compose.yml index 2bc78e830..4e37e835a 100644 --- a/dockge/minio_2025-04-22/docker-compose.yml +++ b/dockge/minio_2025-09-07/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-09-07T16-13-09Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/envs/default.env b/dockge/minio_2025-09-07/envs/default.env similarity index 100% rename from dockge/minio_2025-04-22/envs/default.env rename to dockge/minio_2025-09-07/envs/default.env diff --git a/dockge/minio_2025-04-22/envs/global.env b/dockge/minio_2025-09-07/envs/global.env similarity index 100% rename from dockge/minio_2025-04-22/envs/global.env rename to dockge/minio_2025-09-07/envs/global.env diff --git a/dockge/moontv/.env b/dockge/moontv/.env index c1e2d49fa..4f33d3980 100644 --- a/dockge/moontv/.env +++ b/dockge/moontv/.env @@ -4,9 +4,6 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 -# Authorization Code [必填] -AUTH_TOKEN= - # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv/docker-compose.yml b/dockge/moontv/docker-compose.yml index 399cbb8a3..eedce5001 100644 --- a/dockge/moontv/docker-compose.yml +++ b/dockge/moontv/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:4.3.0 + image: ghcr.io/moontechlab/lunatv:latest labels: createdBy: Apps networks: diff --git a/dockge/moontv_latest/.env b/dockge/moontv_4_3_0/.env similarity index 95% rename from dockge/moontv_latest/.env rename to dockge/moontv_4_3_0/.env index 4f33d3980..c1e2d49fa 100644 --- a/dockge/moontv_latest/.env +++ b/dockge/moontv_4_3_0/.env @@ -4,6 +4,9 @@ PANEL_REDIS_TYPE=redis # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3000 +# Authorization Code [必填] +AUTH_TOKEN= + # 网站名称 [必填] SITE_NAME=MoonTV diff --git a/dockge/moontv_latest/docker-compose.yml b/dockge/moontv_4_3_0/docker-compose.yml similarity index 87% rename from dockge/moontv_latest/docker-compose.yml rename to dockge/moontv_4_3_0/docker-compose.yml index eedce5001..399cbb8a3 100644 --- a/dockge/moontv_latest/docker-compose.yml +++ b/dockge/moontv_4_3_0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: ghcr.io/moontechlab/lunatv:latest + image: ghcr.io/moontechlab/lunatv:4.3.0 labels: createdBy: Apps networks: diff --git a/dockge/moontv_latest/envs/default.env b/dockge/moontv_4_3_0/envs/default.env similarity index 100% rename from dockge/moontv_latest/envs/default.env rename to dockge/moontv_4_3_0/envs/default.env diff --git a/dockge/moontv_latest/envs/global.env b/dockge/moontv_4_3_0/envs/global.env similarity index 100% rename from dockge/moontv_latest/envs/global.env rename to dockge/moontv_4_3_0/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index c53ca32dc..6d6e1a932 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,20 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + [mysqld] -host_cache_size=0 +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files user=mysql -mysql_native_password=ON +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 -log_bin_trust_function_creators=1 -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index ba5d56398..5cac14f48 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.6 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf deleted file mode 100644 index 6d6e1a932..000000000 --- a/dockge/mysql_5_7_44/config/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files -user=mysql - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M -character_set_server=utf8mb4 -lower_case_table_names=1 -group_concat_max_len=1024000 - -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_5_7_44/.env b/dockge/mysql_8_4_6/.env similarity index 100% rename from dockge/mysql_5_7_44/.env rename to dockge/mysql_8_4_6/.env diff --git a/dockge/mysql_8_4_6/config/my.cnf b/dockge/mysql_8_4_6/config/my.cnf new file mode 100644 index 000000000..c53ca32dc --- /dev/null +++ b/dockge/mysql_8_4_6/config/my.cnf @@ -0,0 +1,20 @@ +[mysqld] +host_cache_size=0 +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +user=mysql + +mysql_native_password=ON +character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci +lower_case_table_names=1 +group_concat_max_len=1024000 +log_bin_trust_function_creators=1 + +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ diff --git a/dockge/mysql_5_7_44/docker-compose.yml b/dockge/mysql_8_4_6/docker-compose.yml similarity index 65% rename from dockge/mysql_5_7_44/docker-compose.yml rename to dockge/mysql_8_4_6/docker-compose.yml index 5cac14f48..ba5d56398 100644 --- a/dockge/mysql_5_7_44/docker-compose.yml +++ b/dockge/mysql_8_4_6/docker-compose.yml @@ -5,14 +5,13 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --lower_case_table_names=1 - - --collation-server=utf8mb4_general_ci - - --explicit_defaults_for_timestamp=true + - --collation-server=utf8mb4_unicode_ci + - --mysql-native-password=ON container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:5.7.44 + image: mysql:8.4.6 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/envs/default.env b/dockge/mysql_8_4_6/envs/default.env similarity index 100% rename from dockge/mysql_5_7_44/envs/default.env rename to dockge/mysql_8_4_6/envs/default.env diff --git a/dockge/mysql_5_7_44/envs/global.env b/dockge/mysql_8_4_6/envs/global.env similarity index 100% rename from dockge/mysql_5_7_44/envs/global.env rename to dockge/mysql_8_4_6/envs/global.env diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 7e925e038..cf220b000 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/.env b/dockge/nacos_2_5_1/.env similarity index 100% rename from dockge/nacos_2_4_3/.env rename to dockge/nacos_2_5_1/.env diff --git a/dockge/nacos_2_4_3/docker-compose.yml b/dockge/nacos_2_5_1/docker-compose.yml similarity index 94% rename from dockge/nacos_2_4_3/docker-compose.yml rename to dockge/nacos_2_5_1/docker-compose.yml index cf220b000..7e925e038 100644 --- a/dockge/nacos_2_4_3/docker-compose.yml +++ b/dockge/nacos_2_5_1/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/envs/default.env b/dockge/nacos_2_5_1/envs/default.env similarity index 100% rename from dockge/nacos_2_4_3/envs/default.env rename to dockge/nacos_2_5_1/envs/default.env diff --git a/dockge/nacos_2_4_3/envs/global.env b/dockge/nacos_2_5_1/envs/global.env similarity index 100% rename from dockge/nacos_2_4_3/envs/global.env rename to dockge/nacos_2_5_1/envs/global.env diff --git a/dockge/nacos_2_4_3/init/mysql-schema.sql b/dockge/nacos_2_5_1/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_2_4_3/init/mysql-schema.sql rename to dockge/nacos_2_5_1/init/mysql-schema.sql diff --git a/dockge/postgresql-postgis/docker-compose.yml b/dockge/postgresql-postgis/docker-compose.yml index a2cced821..eded4fd3c 100644 --- a/dockge/postgresql-postgis/docker-compose.yml +++ b/dockge/postgresql-postgis/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:17-3.5 + image: postgis/postgis:16-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_16-3_5/.env b/dockge/postgresql-postgis_17-3_5/.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/.env rename to dockge/postgresql-postgis_17-3_5/.env diff --git a/dockge/postgresql-postgis_16-3_5/docker-compose.yml b/dockge/postgresql-postgis_17-3_5/docker-compose.yml similarity index 94% rename from dockge/postgresql-postgis_16-3_5/docker-compose.yml rename to dockge/postgresql-postgis_17-3_5/docker-compose.yml index eded4fd3c..a2cced821 100644 --- a/dockge/postgresql-postgis_16-3_5/docker-compose.yml +++ b/dockge/postgresql-postgis_17-3_5/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgis/postgis:16-3.5 + image: postgis/postgis:17-3.5 labels: createdBy: Apps networks: diff --git a/dockge/postgresql-postgis_16-3_5/envs/default.env b/dockge/postgresql-postgis_17-3_5/envs/default.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/envs/default.env rename to dockge/postgresql-postgis_17-3_5/envs/default.env diff --git a/dockge/postgresql-postgis_16-3_5/envs/global.env b/dockge/postgresql-postgis_17-3_5/envs/global.env similarity index 100% rename from dockge/postgresql-postgis_16-3_5/envs/global.env rename to dockge/postgresql-postgis_17-3_5/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 9724e766c..e8ef19ae8 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:14 + image: postgres:17.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_6-alpine/.env b/dockge/postgresql_pg14/.env similarity index 100% rename from dockge/postgresql_17_6-alpine/.env rename to dockge/postgresql_pg14/.env diff --git a/dockge/postgresql_17_6-alpine/docker-compose.yml b/dockge/postgresql_pg14/docker-compose.yml similarity index 89% rename from dockge/postgresql_17_6-alpine/docker-compose.yml rename to dockge/postgresql_pg14/docker-compose.yml index e8ef19ae8..9724e766c 100644 --- a/dockge/postgresql_17_6-alpine/docker-compose.yml +++ b/dockge/postgresql_pg14/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg14-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:17.6-alpine + image: postgres:14 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_6-alpine/envs/default.env b/dockge/postgresql_pg14/envs/default.env similarity index 100% rename from dockge/postgresql_17_6-alpine/envs/default.env rename to dockge/postgresql_pg14/envs/default.env diff --git a/dockge/postgresql_17_6-alpine/envs/global.env b/dockge/postgresql_pg14/envs/global.env similarity index 100% rename from dockge/postgresql_17_6-alpine/envs/global.env rename to dockge/postgresql_pg14/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 116044519..5ec4b458b 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/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.1.2 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/.env b/dockge/qbittorrent_5_1_2/.env similarity index 100% rename from dockge/qbittorrent_4_6_7/.env rename to dockge/qbittorrent_5_1_2/.env diff --git a/dockge/qbittorrent_4_6_7/docker-compose.yml b/dockge/qbittorrent_5_1_2/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_4_6_7/docker-compose.yml rename to dockge/qbittorrent_5_1_2/docker-compose.yml index 5ec4b458b..116044519 100644 --- a/dockge/qbittorrent_4_6_7/docker-compose.yml +++ b/dockge/qbittorrent_5_1_2/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:4.6.7 + image: linuxserver/qbittorrent:5.1.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/envs/default.env b/dockge/qbittorrent_5_1_2/envs/default.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/default.env rename to dockge/qbittorrent_5_1_2/envs/default.env diff --git a/dockge/qbittorrent_4_6_7/envs/global.env b/dockge/qbittorrent_5_1_2/envs/global.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/global.env rename to dockge/qbittorrent_5_1_2/envs/global.env diff --git a/dockge/redis/config/redis.conf b/dockge/redis/config/redis.conf index ca22ec9f6..8795ae291 100644 --- a/dockge/redis/config/redis.conf +++ b/dockge/redis/config/redis.conf @@ -32,8 +32,17 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# # include /path/to/local.conf # include /path/to/other.conf +# include /path/to/fragments/*.conf +# ################################## MODULES ##################################### @@ -49,43 +58,81 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 -# bind 127.0.0.1 ::1 +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 loopback interface address (this means Redis will only be able to -# accept client connections from the same host that it is running on). +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# JUST COMMENT OUT THE FOLLOWING LINE. +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and if: -# -# 1) The server is not binding explicitly to a set of addresses using the -# "bind" directive. -# 2) No password is configured. -# -# The server only accepts connections from clients connecting from the -# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain -# sockets. +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured, nor a specific set of interfaces -# are explicitly listed using the "bind" directive. +# even if no authentication is configured. protected-mode yes +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -105,7 +152,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /tmp/redis.sock +# unixsocket /run/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -128,6 +175,16 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -143,8 +200,32 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. # # tls-dh-params-file redis.dh @@ -177,9 +258,12 @@ tcp-keepalive 300 # # tls-cluster yes -# Explicitly specify TLS versions to support. Allowed values are case insensitive -# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -221,6 +305,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -229,11 +314,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -244,6 +335,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -269,44 +363,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -338,6 +462,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -412,9 +551,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -463,7 +603,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -477,12 +617,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -491,19 +637,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -578,6 +728,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -633,7 +820,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -697,8 +884,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -706,10 +897,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -717,8 +909,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -737,6 +938,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -758,6 +967,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -787,8 +1030,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -877,14 +1136,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -901,6 +1158,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -994,6 +1259,13 @@ replica-lazy-flush no lazyfree-lazy-user-del no +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1032,7 +1304,7 @@ lazyfree-lazy-user-del no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1050,7 +1322,7 @@ lazyfree-lazy-user-del no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1071,6 +1343,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1089,14 +1374,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1136,7 +1450,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1189,34 +1503,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1240,6 +1589,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1298,12 +1652,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1318,7 +1681,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1328,7 +1691,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1343,8 +1706,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1354,16 +1763,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1376,7 +1790,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1424,10 +1839,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1449,9 +1878,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1474,71 +1905,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1553,7 +1926,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1581,8 +1954,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1604,7 +1977,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1637,7 +2010,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1661,6 +2034,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1674,6 +2054,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1714,13 +2113,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1817,7 +2216,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis/docker-compose.yml b/dockge/redis/docker-compose.yml index 414c1b027..fe930bde8 100644 --- a/dockge/redis/docker-compose.yml +++ b/dockge/redis/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:6.2.20-alpine + image: redis:7.4.6-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_7_4_6/.env b/dockge/redis_6_2_20/.env similarity index 100% rename from dockge/redis_7_4_6/.env rename to dockge/redis_6_2_20/.env diff --git a/dockge/redis_7_4_6/config/redis.conf b/dockge/redis_6_2_20/config/redis.conf similarity index 72% rename from dockge/redis_7_4_6/config/redis.conf rename to dockge/redis_6_2_20/config/redis.conf index 8795ae291..ca22ec9f6 100644 --- a/dockge/redis_7_4_6/config/redis.conf +++ b/dockge/redis_6_2_20/config/redis.conf @@ -32,17 +32,8 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # -# Included paths may contain wildcards. All files matching the wildcards will -# be included in alphabetical order. -# Note that if an include path contains a wildcards but no files match it when -# the server is started, the include statement will be ignored and no error will -# be emitted. It is safe, therefore, to include wildcard files from empty -# directories. -# # include /path/to/local.conf # include /path/to/other.conf -# include /path/to/fragments/*.conf -# ################################## MODULES ##################################### @@ -58,81 +49,43 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. -# Each address can be prefixed by "-", which means that redis will not fail to -# start if the address is not available. Being not available only refers to -# addresses that does not correspond to any network interface. Addresses that -# are already in use will always fail, and unsupported protocols will always BE -# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses -# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 -# bind * -::* # like the default, all available interfaces +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis -# will only be able to accept client connections from the same host that it is -# running on). +# IPv4 loopback interface address (this means Redis will only be able to +# accept client connections from the same host that it is running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# COMMENT OUT THE FOLLOWING LINE. -# -# You will also need to set a password unless you explicitly disable protected -# mode. +# JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 -# By default, outgoing connections (from replica to master, from Sentinel to -# instances, cluster bus, etc.) are not bound to a specific local address. In -# most cases, this means the operating system will handle that based on routing -# and the interface through which the connection goes out. -# -# Using bind-source-addr it is possible to configure a specific address to bind -# to, which may also affect how the connection gets routed. -# -# Example: -# -# bind-source-addr 10.0.0.1 - # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and the default user has no password, the server -# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address -# (::1) or Unix domain sockets. +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured. +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. protected-mode yes -# Redis uses default hardened security configuration directives to reduce the -# attack surface on innocent users. Therefore, several sensitive configuration -# directives are immutable, and some potentially-dangerous commands are blocked. -# -# Configuration directives that control files that Redis writes to (e.g., 'dir' -# and 'dbfilename') and that aren't usually modified during runtime -# are protected by making them immutable. -# -# Commands that can increase the attack surface of Redis and that aren't usually -# called by users are blocked by default. -# -# These can be exposed to either all connections or just local ones by setting -# each of the configs listed below to either of these values: -# -# no - Block for any connection (remain immutable) -# yes - Allow for any connection (no protection) -# local - Allow only for local connections. Ones originating from the -# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. -# -# enable-protected-configs no -# enable-debug-command no -# enable-module-command no - # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -152,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /run/redis.sock +# unixsocket /tmp/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -175,16 +128,6 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 -# Apply OS-specific mechanism to mark the listening socket with the specified -# ID, to support advanced routing and filtering capabilities. -# -# On Linux, the ID represents a connection mark. -# On FreeBSD, the ID represents a socket cookie ID. -# On OpenBSD, the ID represents a route table ID. -# -# The default value is 0, which implies no marking is required. -# socket-mark-id 0 - ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -200,32 +143,8 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-key-file-pass secret -# Normally Redis uses the same certificate for both server functions (accepting -# connections) and client functions (replicating from a master, establishing -# cluster bus connections, etc.). -# -# Sometimes certificates are issued with attributes that designate them as -# client-only or server-only certificates. In that case it may be desired to use -# different certificates for incoming (server) and outgoing (client) -# connections. To do that, use the following directives: -# -# tls-client-cert-file client.crt -# tls-client-key-file client.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-client-key-file-pass secret - -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, -# required by older versions of OpenSSL (<3.0). Newer versions do not require -# this configuration and recommend against it. +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # # tls-dh-params-file redis.dh @@ -258,12 +177,9 @@ tcp-keepalive 300 # # tls-cluster yes -# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended -# that older formally deprecated versions are kept disabled to reduce the attack surface. -# You can explicitly specify TLS versions to support. -# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", -# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. -# To enable only TLSv1.2 and TLSv1.3, use: +# Explicitly specify TLS versions to support. Allowed values are case insensitive +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or +# any combination. To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -305,7 +221,6 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -314,17 +229,11 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET -# on startup, and updating Redis status on a regular -# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -# -# The default is "no". To run under upstart/systemd, you can simply uncomment -# the line below: -# -# supervised auto +supervised no # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -335,9 +244,6 @@ daemonize no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -# -# Note that on modern Linux systems "/run/redis.pid" is more conforming -# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -363,74 +269,44 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 -# To disable the built in crash log, which will possibly produce cleaner core -# dumps when they are needed, uncomment the following: -# -# crash-log-enabled no - -# To disable the fast memory check that's run as part of the crash log, which -# will possibly let redis terminate sooner, uncomment the following: -# -# crash-memcheck-enabled no - # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY and syslog logging is -# disabled. Basically this means that normally a logo is displayed only in -# interactive sessions. +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo no - -# By default, Redis modifies the process title (as seen in 'top' and 'ps') to -# provide some runtime information. It is possible to disable this and leave -# the process name as executed by setting the following to no. -set-proc-title yes - -# When changing the process title, Redis uses the following template to construct -# the modified title. -# -# Template variables are specified in curly brackets. The following variables are -# supported: -# -# {title} Name of process as executed if parent, or type of child process. -# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or -# Unix socket if only that's available. -# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". -# {port} TCP port listening on, or 0. -# {tls-port} TLS port listening on, or 0. -# {unixsocket} Unix domain socket listening on, or "". -# {config-file} Name of configuration file used. -# -proc-title-template "{title} {listen-addr} {server-mode}" +always-show-logo yes ################################ SNAPSHOTTING ################################ +# +# Save the DB on disk: +# +# save +# +# Will save the DB if both the given number of seconds and the given +# number of write operations against the DB occurred. +# +# In the example below the behavior will be to save: +# after 900 sec (15 min) if at least 1 key changed +# after 300 sec (5 min) if at least 10 keys changed +# after 60 sec if at least 10000 keys changed +# +# Note: you can disable saving completely by commenting out all "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" -# Save the DB to disk. -# -# save [ ...] -# -# Redis will save the DB if the given number of seconds elapsed and it -# surpassed the given number of write operations against the DB. -# -# Snapshotting can be completely disabled with a single empty string argument -# as in following example: -# -# save "" -# -# Unless specified otherwise, by default Redis will save the DB: -# * After 3600 seconds (an hour) if at least 1 change was performed -# * After 300 seconds (5 minutes) if at least 100 changes were performed -# * After 60 seconds if at least 10000 changes were performed -# -# You can set these explicitly by uncommenting the following line. -# -# save 3600 1 300 100 60 10000 +save 900 1 +save 300 10 +save 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -462,21 +338,6 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes -# Enables or disables full sanitization checks for ziplist and listpack etc when -# loading an RDB or RESTORE payload. This reduces the chances of a assertion or -# crash later on while processing commands. -# Options: -# no - Never perform full sanitization -# yes - Always perform full sanitization -# clients - Perform full sanitization only for user connections. -# Excludes: RDB files, RESTORE commands received from the master -# connection, and client connections which have the -# skip-sanitize-payload ACL flag. -# The default should be 'clients' but since it currently affects cluster -# resharding via MIGRATE, it is temporarily set to 'no' by default. -# -# sanitize-dump-payload no - # The filename where to dump the DB dbfilename dump.rdb @@ -551,10 +412,9 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error -# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" -# to all data access commands, excluding commands such as: -# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with +# an error "SYNC with master in progress" to all commands except: +# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -603,7 +463,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync yes +repl-diskless-sync no # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -617,18 +477,12 @@ repl-diskless-sync yes # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# When diskless replication is enabled with a delay, it is possible to let -# the replication start before the maximum delay is reached if the maximum -# number of replicas expected have connected. Default of 0 means that the -# maximum is not defined and Redis will wait the full delay. -repl-diskless-sync-max-replicas 0 - # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if you know what you are doing. +# stage with the master. Use only if your do what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -637,23 +491,19 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and replica buffers). +# Copy on Write memory and salve buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep current db contents in RAM while parsing the data directly -# from the socket. Replicas in this mode can keep serving current -# data set while replication is in progress, except for cases where -# they can't recognize master as having a data set from same -# replication history. -# Note that this requires sufficient memory, if you don't have it, -# you risk an OOM kill. +# "swapdb" - Keep a copy of the current db contents in RAM while parsing +# the data directly from the socket. note that this requires +# sufficient memory, if you don't have it, you risk an OOM kill. repl-diskless-load disabled -# Master send PINGs to its replicas in a predefined interval. It's possible to +# Replicas send PINGs to server in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -728,43 +578,6 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 -# The propagation error behavior controls how Redis will behave when it is -# unable to handle a command being processed in the replication stream from a master -# or processed while reading from an AOF file. Errors that occur during propagation -# are unexpected, and can cause data inconsistency. However, there are edge cases -# in earlier versions of Redis where it was possible for the server to replicate or persist -# commands that would fail on future versions. For this reason the default behavior -# is to ignore such errors and continue processing commands. -# -# If an application wants to ensure there is no data divergence, this configuration -# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' -# to only panic when a replica encounters an error on the replication stream. One of -# these two panic values will become the default value in the future once there are -# sufficient safety mechanisms in place to prevent false positive crashes. -# -# propagation-error-behavior ignore - -# Replica ignore disk write errors controls the behavior of a replica when it is -# unable to persist a write command received from its master to disk. By default, -# this configuration is set to 'no' and will crash the replica in this condition. -# It is not recommended to change this default, however in order to be compatible -# with older versions of Redis this config can be toggled to 'yes' which will just -# log a warning and execute the write command it got from the master. -# -# replica-ignore-disk-write-errors no - -# ----------------------------------------------------------------------------- -# By default, Redis Sentinel includes all replicas in its reports. A replica -# can be excluded from Redis Sentinel's announcements. An unannounced replica -# will be ignored by the 'sentinel replicas ' command and won't be -# exposed to Redis Sentinel's clients. -# -# This option does not change the behavior of replica-priority. Even with -# replica-announced set to 'no', the replica can be promoted to master. To -# prevent this behavior, set replica-priority to 0. -# -# replica-announced yes - # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -820,7 +633,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# a radix key indexed by key name, what clients have which keys. In turn +# 16 millions of slots, what clients may have certain subsets of keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -884,12 +697,8 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. -# sanitize-payload RESTORE dump-payload is sanitized (default). -# + Allow the execution of that command. -# May be used with `|` for allowing subcommands (e.g "+config|get") -# - Disallow the execution of that command. -# May be used with `|` for blocking subcommands (e.g "-config|set") +# + Allow the execution of that command +# - Disallow the execution of that command # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -897,11 +706,10 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|first-arg Allow a specific first argument of an otherwise -# disabled command. It is only supported on commands with -# no sub-commands, and is not allowed as negative form -# like -SELECT|1, only additive starting with "+". This -# feature is deprecated and may be removed in the future. +# +|subcommand Allow a specific subcommand of an otherwise +# disabled command. Note that this form is not +# allowed as negative like -DEBUG|SEGFAULT, but +# only additive starting with "+". # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -909,17 +717,8 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read -# from. -# %W~ Add key write pattern that specifies which keys can be -# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. -# & Add a glob-style pattern of Pub/Sub channels that can be -# accessed by the user. It is possible to specify multiple channel -# patterns. -# allchannels Alias for &* -# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -938,14 +737,6 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. -# () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last -# character must be ). -# clearselectors Remove all of the currently attached selectors. -# Note this does not change the "root" user permissions, -# which are the permissions directly applied onto the -# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -967,40 +758,6 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # -# The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata -# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, -# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, -# key or metadata will also have `write` category. Commands that only read -# the keyspace, key or metadata will have the `read` category. -# * read - Reading from keys (values or metadata). Note that commands that don't -# interact with keys, will not have either `read` or `write`. -# * write - Writing to keys (values or metadata) -# * admin - Administrative commands. Normal applications will never need to use -# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. -# * dangerous - Potentially dangerous (each should be considered with care for -# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, -# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. -# * connection - Commands affecting the connection or other connections. -# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. -# * blocking - Potentially blocking the connection until released by another -# command. -# * fast - Fast O(1) commands. May loop on the number of arguments, but not the -# number of elements in the key. -# * slow - All commands that are not Fast. -# * pubsub - PUBLISH / SUBSCRIBE related -# * transaction - WATCH / MULTI / EXEC related commands. -# * scripting - Scripting related. -# * set - Data type: sets related. -# * sortedset - Data type: zsets related. -# * list - Data type: lists related. -# * hash - Data type: hashes related. -# * string - Data type: strings related. -# * bitmap - Data type: bitmaps related. -# * hyperloglog - Data type: hyperloglog related. -# * geo - Data type: geo related. -# * stream - Data type: streams related. -# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -1030,24 +787,8 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# The requirepass is not compatible with aclfile option and the ACL LOAD -# command, these will cause requirepass to be ignored. -# # requirepass foobared -# New users are initialized with restrictive permissions by default, via the -# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it -# is possible to manage access to Pub/Sub channels with ACL rules as well. The -# default Pub/Sub channels permission if new users is controlled by the -# acl-pubsub-default configuration directive, which accepts one of these values: -# -# allchannels: grants access to all Pub/Sub channels -# resetchannels: revokes access to all Pub/Sub channels -# -# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. -# -# acl-pubsub-default resetchannels - # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -1136,12 +877,14 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, when there are no suitable keys for -# eviction, Redis will return an error on write operations that require -# more memory. These are usually commands that create new keys, add data or -# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, -# SORT (due to the STORE argument), and EXEC (if the transaction includes any -# command that requires memory). +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append +# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd +# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby +# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby +# getset mset msetnx exec sort # # The default is: # @@ -1158,14 +901,6 @@ acllog-max-len 128 # # maxmemory-samples 5 -# Eviction processing is designed to function well with the default setting. -# If there is an unusually large amount of write traffic, this value may need to -# be increased. Decreasing this value may reduce latency at the risk of -# eviction processing effectiveness -# 0 = minimum latency, 10 = default, 100 = process without regard to latency -# -# maxmemory-eviction-tenacity 10 - # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -1259,13 +994,6 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous -# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the -# commands. When neither flag is passed, this directive will be used to determine -# if the data should be deleted asynchronously. - -lazyfree-lazy-user-flush no - ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1304,7 +1032,7 @@ lazyfree-lazy-user-flush no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Also, this feature currently does not work when SSL is +# CONFIG SET. Aso this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1322,7 +1050,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports these options: +# Redis supports three options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1343,19 +1071,6 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 - -#################### KERNEL transparent hugepage CONTROL ###################### - -# Usually the kernel Transparent Huge Pages control is set to "madvise" or -# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which -# case this config has no effect. On systems in which it is set to "always", -# redis will attempt to disable it specifically for the redis process in order -# to avoid latency problems specifically with fork(2) and CoW. -# If for some reason you prefer to keep it enabled, you can set this config to -# "no" and the kernel global to "always". - -disable-thp yes - ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1374,43 +1089,14 @@ disable-thp yes # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check https://redis.io/topics/persistence for more information. +# Please check http://redis.io/topics/persistence for more information. appendonly no -# The base name of the append only file. -# -# Redis 7 and newer use a set of append-only files to persist the dataset -# and changes applied to it. There are two basic types of files in use: -# -# - Base files, which are a snapshot representing the complete state of the -# dataset at the time the file was created. Base files can be either in -# the form of RDB (binary serialized) or AOF (textual commands). -# - Incremental files, which contain additional commands that were applied -# to the dataset following the previous file. -# -# In addition, manifest files are used to track the files and the order in -# which they were created and should be applied. -# -# Append-only file names are created by Redis following a specific pattern. -# The file name's prefix is based on the 'appendfilename' configuration -# parameter, followed by additional information about the sequence and type. -# -# For example, if appendfilename is set to appendonly.aof, the following file -# names could be derived: -# -# - appendonly.aof.1.base.rdb as a base file. -# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. -# - appendonly.aof.manifest as a manifest file. +# The name of the append only file (default: "appendonly.aof") appendfilename "appendonly.aof" -# For convenience, Redis stores all persistent append-only files in a dedicated -# directory. The name of the directory is determined by the appenddirname -# configuration parameter. - -appenddirname "appendonlydir" - # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1450,7 +1136,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync no". In practical terms, this means that it is +# the same as "appendfsync none". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1503,69 +1189,34 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# Redis can create append-only base files in either RDB or AOF formats. Using -# the RDB format is always faster and more efficient, and disabling it is only -# supported for backward compatibility purposes. +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading, Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, then continues loading the AOF +# tail. aof-use-rdb-preamble yes -# Redis supports recording timestamp annotations in the AOF to support restoring -# the data from a specific point-in-time. However, using this capability changes -# the AOF format in a way that may not be compatible with existing AOF parsers. -aof-timestamp-enabled no +################################ LUA SCRIPTING ############################### -################################ SHUTDOWN ##################################### - -# Maximum time to wait for replicas when shutting down, in seconds. +# Max execution time of a Lua script in milliseconds. # -# During shut down, a grace period allows any lagging replicas to catch up with -# the latest replication offset before the master exists. This period can -# prevent data loss, especially for deployments without configured disk backups. +# If the maximum execution time is reached Redis will log that a script is +# still in execution after the maximum allowed time and will start to +# reply to queries with an error. # -# The 'shutdown-timeout' value is the grace period's duration in seconds. It is -# only applicable when the instance has replicas. To disable the feature, set -# the value to 0. +# When a long running script exceeds the maximum execution time only the +# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be +# used to stop a script that did not yet call any write commands. The second +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural +# termination of the script. # -# shutdown-timeout 10 - -# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default -# an RDB snapshot is written to disk in a blocking operation if save points are configured. -# The options used on signaled shutdown can include the following values: -# default: Saves RDB snapshot only if save points are configured. -# Waits for lagging replicas to catch up. -# save: Forces a DB saving operation even if no save points are configured. -# nosave: Prevents DB saving operation even if one or more save points are configured. -# now: Skips waiting for lagging replicas. -# force: Ignores any errors that would normally prevent the server from exiting. -# -# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. -# Example: "nosave force now" -# -# shutdown-on-sigint default -# shutdown-on-sigterm default - -################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### - -# Maximum time in milliseconds for EVAL scripts, functions and in some cases -# modules' commands before Redis can start processing or rejecting other clients. -# -# If the maximum execution time is reached Redis will start to reply to most -# commands with a BUSY error. -# -# In this state Redis will only allow a handful of commands to be executed. -# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. -# -# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not -# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop -# the server in the case a write command was already issued by the script when -# the user doesn't want to wait for the natural termination of the script. -# -# The default is 5 seconds. It is possible to set it to 0 or a negative value -# to disable this mechanism (uninterrupted execution). Note that in the past -# this config had a different name, which is now an alias, so both of these do -# the same: -# lua-time-limit 5000 -# busy-reply-threshold 5000 +# Set it to 0 or a negative value for unlimited execution without warnings. +lua-time-limit 5000 ################################ REDIS CLUSTER ############################### @@ -1589,11 +1240,6 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires -# you to specify the cluster bus port when executing cluster meet. -# cluster-port 0 - # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1652,21 +1298,12 @@ aof-timestamp-enabled no # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value or -# set cluster-allow-replica-migration to 'no'. +# one replica). To disable migration just set it to a very large value. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 -# Turning off this option allows to use less automatic cluster configuration. -# It both disables migration to orphaned masters and migration from masters -# that became empty. -# -# Default is 'yes' (allow automatic migrations). -# -# cluster-allow-replica-migration yes - # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1681,7 +1318,7 @@ aof-timestamp-enabled no # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the replica can still perform a +# master during master failures. However the master can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1691,7 +1328,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1706,54 +1343,8 @@ aof-timestamp-enabled no # # cluster-allow-reads-when-down no -# This option, when set to yes, allows nodes to serve pubsub shard traffic while -# the cluster is in a down state, as long as it believes it owns the slots. -# -# This is useful if the application would like to use the pubsub feature even when -# the cluster global stable state is not OK. If the application wants to make sure only -# one shard is serving a given channel, this feature should be kept as yes. -# -# cluster-allow-pubsubshard-when-down yes - -# Cluster link send buffer limit is the limit on the memory usage of an individual -# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed -# this limit. This is to primarily prevent send buffers from growing unbounded on links -# toward slow peers (E.g. PubSub messages being piled up). -# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field -# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. -# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single -# PubSub message by default. (client-query-buffer-limit default value is 1gb) -# -# cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for -# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based -# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propagate the removal. -# -# cluster-announce-hostname "" - -# Clusters can advertise how clients should connect to them using either their IP address, -# a user defined hostname, or by declaring they have no endpoint. Which endpoint is -# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type -# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' -# will be returned instead. -# -# When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the -# server doesn't know which one the client took. In this case, the server is expecting -# the client to reach out on the same endpoint it used for making the last request, but use -# the port provided in the response. -# -# cluster-preferred-endpoint-type ip - # In order to setup your cluster make sure to read the documentation -# available at https://redis.io web site. +# available at http://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1763,21 +1354,16 @@ aof-timestamp-enabled no # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following four options are used for this scope, and are: +# following two options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port -# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client ports (for connections -# without and with TLS) and cluster message bus port. The information is then -# published in the header of the bus packets so that other nodes will be able to -# correctly map the address of the node publishing the information. -# -# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set -# to zero, then cluster-announce-port refers to the TLS port. Note also that -# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# Each instructs the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1790,8 +1376,7 @@ aof-timestamp-enabled no # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-tls-port 6379 -# cluster-announce-port 0 +# cluster-announce-port 6379 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1839,24 +1424,10 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 -################################ LATENCY TRACKING ############################## - -# The Redis extended latency monitoring tracks the per command latencies and enables -# exporting the percentile distribution via the INFO latencystats command, -# and cumulative latency distributions (histograms) via the LATENCY command. -# -# By default, the extended latency monitoring is enabled since the overhead -# of keeping track of the command latency is very small. -# latency-tracking yes - -# By default the exported latency percentiles via the INFO latencystats command -# are the p50, p99, and p999. -# latency-tracking-info-percentiles 50 99 99.9 - ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at https://redis.io/topics/notifications +# This feature is documented at http://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1878,11 +1449,9 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) -# n New key events (Note: not included in the 'A' class) # t Stream commands -# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# A Alias for g$lshzxet, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1905,13 +1474,71 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" +############################### GOPHER SERVER ################################# + +# Redis contains an implementation of the Gopher protocol, as specified in +# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). +# +# The Gopher protocol was very popular in the late '90s. It is an alternative +# to the web, and the implementation both server and client side is so simple +# that the Redis server has just 100 lines of code in order to implement this +# support. +# +# What do you do with Gopher nowadays? Well Gopher never *really* died, and +# lately there is a movement in order for the Gopher more hierarchical content +# composed of just plain text documents to be resurrected. Some want a simpler +# internet, others believe that the mainstream internet became too much +# controlled, and it's cool to create an alternative space for people that +# want a bit of fresh air. +# +# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol +# as a gift. +# +# --- HOW IT WORKS? --- +# +# The Redis Gopher support uses the inline protocol of Redis, and specifically +# two kind of inline requests that were anyway illegal: an empty request +# or any request that starts with "/" (there are no Redis commands starting +# with such a slash). Normal RESP2/RESP3 requests are completely out of the +# path of the Gopher protocol implementation and are served as usual as well. +# +# If you open a connection to Redis when Gopher is enabled and send it +# a string like "/foo", if there is a key named "/foo" it is served via the +# Gopher protocol. +# +# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher +# talking), you likely need a script like the following: +# +# https://github.com/antirez/gopher2redis +# +# --- SECURITY WARNING --- +# +# If you plan to put Redis on the internet in a publicly accessible address +# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. +# Once a password is set: +# +# 1. The Gopher server (when enabled, not by default) will still serve +# content via Gopher. +# 2. However other commands cannot be called before the client will +# authenticate. +# +# So use the 'requirepass' option to protect your instance. +# +# Note that Gopher is not currently supported when 'io-threads-do-reads' +# is enabled. +# +# To enable Gopher support, uncomment the following line and set the option +# from no (the default) to yes. +# +# gopher-enabled no + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-listpack-entries 512 -hash-max-listpack-value 64 +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1926,7 +1553,7 @@ hash-max-listpack-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-listpack-size -2 +list-max-ziplist-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1954,8 +1581,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-listpack-entries 128 -zset-max-listpack-value 64 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1977,7 +1604,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entries limit by setting max-bytes to 0 and max-entries to the desired +# max entires limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -2010,7 +1637,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2034,13 +1661,6 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # -# Note that it doesn't make sense to set the replica clients output buffer -# limit lower than the repl-backlog-size config (partial sync will succeed -# and then replica will get disconnected). -# Such a configuration is ignored (the size of repl-backlog-size will be used). -# This doesn't have memory consumption implications since the replica client -# will share the backlog buffers memory. -# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -2054,25 +1674,6 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb -# In some scenarios client connections can hog up memory leading to OOM -# errors or data eviction. To avoid this we can cap the accumulated memory -# used by all client connections (all pubsub and normal clients). Once we -# reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most -# memory first. We call this mechanism "client eviction". -# -# Client eviction is configured using the maxmemory-clients setting as follows: -# 0 - client eviction is disabled (default) -# -# A memory value can be used for the client eviction threshold, -# for example: -# maxmemory-clients 1g -# -# A percentage value (between 1% and 100%) means the client eviction threshold -# is based on a percentage of the maxmemory setting. For example to set client -# eviction at 5% of maxmemory: -# maxmemory-clients 5% - # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -2113,13 +1714,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -2216,7 +1817,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Active defragmentation is disabled by default +# Enabled active defragmentation # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis_7_4_6/docker-compose.yml b/dockge/redis_6_2_20/docker-compose.yml similarity index 94% rename from dockge/redis_7_4_6/docker-compose.yml rename to dockge/redis_6_2_20/docker-compose.yml index fe930bde8..414c1b027 100644 --- a/dockge/redis_7_4_6/docker-compose.yml +++ b/dockge/redis_6_2_20/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:7.4.6-alpine + image: redis:6.2.20-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_7_4_6/envs/default.env b/dockge/redis_6_2_20/envs/default.env similarity index 100% rename from dockge/redis_7_4_6/envs/default.env rename to dockge/redis_6_2_20/envs/default.env diff --git a/dockge/redis_7_4_6/envs/global.env b/dockge/redis_6_2_20/envs/global.env similarity index 100% rename from dockge/redis_7_4_6/envs/global.env rename to dockge/redis_6_2_20/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/.env b/dockge/stream-rec-backend_main/.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/.env rename to dockge/stream-rec-backend_main/.env diff --git a/dockge/stream-rec-backend_0_7_2/docker-compose.yml b/dockge/stream-rec-backend_main/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_0_7_2/docker-compose.yml rename to dockge/stream-rec-backend_main/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-backend_main/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/envs/default.env b/dockge/stream-rec-backend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/default.env rename to dockge/stream-rec-backend_main/envs/default.env diff --git a/dockge/stream-rec-backend_0_7_2/envs/global.env b/dockge/stream-rec-backend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/global.env rename to dockge/stream-rec-backend_main/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/.env b/dockge/stream-rec-frontend_main/.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/.env rename to dockge/stream-rec-frontend_main/.env diff --git a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml b/dockge/stream-rec-frontend_main/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_0_7_2/docker-compose.yml rename to dockge/stream-rec-frontend_main/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-frontend_main/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/envs/default.env b/dockge/stream-rec-frontend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/default.env rename to dockge/stream-rec-frontend_main/envs/default.env diff --git a/dockge/stream-rec-frontend_0_7_2/envs/global.env b/dockge/stream-rec-frontend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/global.env rename to dockge/stream-rec-frontend_main/envs/global.env diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 8465b7136..03a278089 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:dev + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:dev + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_0_7_2/.env b/dockge/stream-rec_dev/.env similarity index 100% rename from dockge/stream-rec_0_7_2/.env rename to dockge/stream-rec_dev/.env diff --git a/dockge/stream-rec_0_7_2/docker-compose.yml b/dockge/stream-rec_dev/docker-compose.yml similarity index 92% rename from dockge/stream-rec_0_7_2/docker-compose.yml rename to dockge/stream-rec_dev/docker-compose.yml index 03a278089..8465b7136 100644 --- a/dockge/stream-rec_0_7_2/docker-compose.yml +++ b/dockge/stream-rec_dev/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_0_7_2/envs/default.env b/dockge/stream-rec_dev/envs/default.env similarity index 100% rename from dockge/stream-rec_0_7_2/envs/default.env rename to dockge/stream-rec_dev/envs/default.env diff --git a/dockge/stream-rec_0_7_2/envs/global.env b/dockge/stream-rec_dev/envs/global.env similarity index 100% rename from dockge/stream-rec_0_7_2/envs/global.env rename to dockge/stream-rec_dev/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 5fa74c158..32a291fcd 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,9 +4,3 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env new file mode 100644 index 000000000..5fa74c158 --- /dev/null +++ b/dockge/uptime-kuma_1_23_16/.env @@ -0,0 +1,12 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= + +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false + diff --git a/dockge/uptime-kuma_2_0_0/docker-compose.yml b/dockge/uptime-kuma_1_23_16/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_2_0_0/docker-compose.yml rename to dockge/uptime-kuma_1_23_16/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma_2_0_0/docker-compose.yml +++ b/dockge/uptime-kuma_1_23_16/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_2_0_0/envs/default.env b/dockge/uptime-kuma_1_23_16/envs/default.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/default.env rename to dockge/uptime-kuma_1_23_16/envs/default.env diff --git a/dockge/uptime-kuma_2_0_0/envs/global.env b/dockge/uptime-kuma_1_23_16/envs/global.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/global.env rename to dockge/uptime-kuma_1_23_16/envs/global.env diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env deleted file mode 100644 index 32a291fcd..000000000 --- a/dockge/uptime-kuma_2_0_0/.env +++ /dev/null @@ -1,6 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - From 896e1e1fba5e1d4efeb880528997923e7157f96b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 13:51:05 +0000 Subject: [PATCH 200/262] Update dockurr/macos Docker tag to v2.25 --- apps/macos/2.24/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/macos/2.24/docker-compose.yml b/apps/macos/2.24/docker-compose.yml index c04bfdefd..f9c7102af 100644 --- a/apps/macos/2.24/docker-compose.yml +++ b/apps/macos/2.24/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: windows: - image: dockurr/macos:2.24 + image: dockurr/macos:2.25 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 97dfcb0dfbfca88fb2e8e2af030e4fd8dcaf0adf Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 13:51:20 +0000 Subject: [PATCH 201/262] Update app version [skip ci] --- apps/macos/{2.24 => 2.25}/data.yml | 0 apps/macos/{2.24 => 2.25}/docker-compose.yml | 0 apps/macos/{2.24 => 2.25}/envs/default.env | 0 apps/macos/{2.24 => 2.25}/envs/global.env | 0 apps/macos/{2.24 => 2.25}/scripts/init.sh | 0 apps/macos/{2.24 => 2.25}/scripts/uninstall.sh | 0 apps/macos/{2.24 => 2.25}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/macos/{2.24 => 2.25}/data.yml (100%) rename apps/macos/{2.24 => 2.25}/docker-compose.yml (100%) rename apps/macos/{2.24 => 2.25}/envs/default.env (100%) rename apps/macos/{2.24 => 2.25}/envs/global.env (100%) rename apps/macos/{2.24 => 2.25}/scripts/init.sh (100%) rename apps/macos/{2.24 => 2.25}/scripts/uninstall.sh (100%) rename apps/macos/{2.24 => 2.25}/scripts/upgrade.sh (100%) diff --git a/apps/macos/2.24/data.yml b/apps/macos/2.25/data.yml similarity index 100% rename from apps/macos/2.24/data.yml rename to apps/macos/2.25/data.yml diff --git a/apps/macos/2.24/docker-compose.yml b/apps/macos/2.25/docker-compose.yml similarity index 100% rename from apps/macos/2.24/docker-compose.yml rename to apps/macos/2.25/docker-compose.yml diff --git a/apps/macos/2.24/envs/default.env b/apps/macos/2.25/envs/default.env similarity index 100% rename from apps/macos/2.24/envs/default.env rename to apps/macos/2.25/envs/default.env diff --git a/apps/macos/2.24/envs/global.env b/apps/macos/2.25/envs/global.env similarity index 100% rename from apps/macos/2.24/envs/global.env rename to apps/macos/2.25/envs/global.env diff --git a/apps/macos/2.24/scripts/init.sh b/apps/macos/2.25/scripts/init.sh similarity index 100% rename from apps/macos/2.24/scripts/init.sh rename to apps/macos/2.25/scripts/init.sh diff --git a/apps/macos/2.24/scripts/uninstall.sh b/apps/macos/2.25/scripts/uninstall.sh similarity index 100% rename from apps/macos/2.24/scripts/uninstall.sh rename to apps/macos/2.25/scripts/uninstall.sh diff --git a/apps/macos/2.24/scripts/upgrade.sh b/apps/macos/2.25/scripts/upgrade.sh similarity index 100% rename from apps/macos/2.24/scripts/upgrade.sh rename to apps/macos/2.25/scripts/upgrade.sh From 92280acdd6c5f3a03b8c7590b61e399b5aec7c0f Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 17 Oct 2025 15:21:20 +0000 Subject: [PATCH 202/262] Processed apps directory via GitHub Actions --- appstore/macos/{2.24 => 2.25}/.env | 0 appstore/macos/{2.24 => 2.25}/data.yml | 0 appstore/macos/{2.24 => 2.25}/docker-compose.yml | 2 +- appstore/macos/{2.24 => 2.25}/envs/default.env | 0 appstore/macos/{2.24 => 2.25}/envs/global.env | 0 appstore/macos/{2.24 => 2.25}/scripts/init.sh | 0 appstore/macos/{2.24 => 2.25}/scripts/uninstall.sh | 0 appstore/macos/{2.24 => 2.25}/scripts/upgrade.sh | 0 dockge/macos/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/macos/{2.24 => 2.25}/.env (100%) rename appstore/macos/{2.24 => 2.25}/data.yml (100%) rename appstore/macos/{2.24 => 2.25}/docker-compose.yml (95%) rename appstore/macos/{2.24 => 2.25}/envs/default.env (100%) rename appstore/macos/{2.24 => 2.25}/envs/global.env (100%) rename appstore/macos/{2.24 => 2.25}/scripts/init.sh (100%) rename appstore/macos/{2.24 => 2.25}/scripts/uninstall.sh (100%) rename appstore/macos/{2.24 => 2.25}/scripts/upgrade.sh (100%) diff --git a/appstore/macos/2.24/.env b/appstore/macos/2.25/.env similarity index 100% rename from appstore/macos/2.24/.env rename to appstore/macos/2.25/.env diff --git a/appstore/macos/2.24/data.yml b/appstore/macos/2.25/data.yml similarity index 100% rename from appstore/macos/2.24/data.yml rename to appstore/macos/2.25/data.yml diff --git a/appstore/macos/2.24/docker-compose.yml b/appstore/macos/2.25/docker-compose.yml similarity index 95% rename from appstore/macos/2.24/docker-compose.yml rename to appstore/macos/2.25/docker-compose.yml index e2ec21ecc..1a128e0a7 100644 --- a/appstore/macos/2.24/docker-compose.yml +++ b/appstore/macos/2.25/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - VERSION=${VERSION} - image: dockurr/macos:2.24 + image: dockurr/macos:2.25 labels: createdBy: Apps networks: diff --git a/appstore/macos/2.24/envs/default.env b/appstore/macos/2.25/envs/default.env similarity index 100% rename from appstore/macos/2.24/envs/default.env rename to appstore/macos/2.25/envs/default.env diff --git a/appstore/macos/2.24/envs/global.env b/appstore/macos/2.25/envs/global.env similarity index 100% rename from appstore/macos/2.24/envs/global.env rename to appstore/macos/2.25/envs/global.env diff --git a/appstore/macos/2.24/scripts/init.sh b/appstore/macos/2.25/scripts/init.sh similarity index 100% rename from appstore/macos/2.24/scripts/init.sh rename to appstore/macos/2.25/scripts/init.sh diff --git a/appstore/macos/2.24/scripts/uninstall.sh b/appstore/macos/2.25/scripts/uninstall.sh similarity index 100% rename from appstore/macos/2.24/scripts/uninstall.sh rename to appstore/macos/2.25/scripts/uninstall.sh diff --git a/appstore/macos/2.24/scripts/upgrade.sh b/appstore/macos/2.25/scripts/upgrade.sh similarity index 100% rename from appstore/macos/2.24/scripts/upgrade.sh rename to appstore/macos/2.25/scripts/upgrade.sh diff --git a/dockge/macos/docker-compose.yml b/dockge/macos/docker-compose.yml index e2ec21ecc..1a128e0a7 100644 --- a/dockge/macos/docker-compose.yml +++ b/dockge/macos/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - VERSION=${VERSION} - image: dockurr/macos:2.24 + image: dockurr/macos:2.25 labels: createdBy: Apps networks: From 73793af03b654d584a2cf1fe7734eb399e335b20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:25:44 +0000 Subject: [PATCH 203/262] Update casbin/casdoor Docker tag to v2.87.0 --- apps/casdoor/2.86.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.86.0/docker-compose.yml b/apps/casdoor/2.86.0/docker-compose.yml index cc0ed4696..c0763216c 100644 --- a/apps/casdoor/2.86.0/docker-compose.yml +++ b/apps/casdoor/2.86.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.86.0 + image: casbin/casdoor:v2.87.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From d9648c5da5c80c3939fa33fab8b2fa6037a2d84a Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 16:25:55 +0000 Subject: [PATCH 204/262] Update app version [skip ci] --- apps/casdoor/{2.86.0 => 2.87.0}/config/init_data.json | 0 apps/casdoor/{2.86.0 => 2.87.0}/data.yml | 0 apps/casdoor/{2.86.0 => 2.87.0}/docker-compose.yml | 0 apps/casdoor/{2.86.0 => 2.87.0}/envs/casdoor.env | 0 apps/casdoor/{2.86.0 => 2.87.0}/envs/default.env | 0 apps/casdoor/{2.86.0 => 2.87.0}/envs/global.env | 0 apps/casdoor/{2.86.0 => 2.87.0}/scripts/init.sh | 0 apps/casdoor/{2.86.0 => 2.87.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.86.0 => 2.87.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.86.0 => 2.87.0}/config/init_data.json (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/data.yml (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/docker-compose.yml (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/envs/default.env (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/envs/global.env (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/scripts/init.sh (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.86.0 => 2.87.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.86.0/config/init_data.json b/apps/casdoor/2.87.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.86.0/config/init_data.json rename to apps/casdoor/2.87.0/config/init_data.json diff --git a/apps/casdoor/2.86.0/data.yml b/apps/casdoor/2.87.0/data.yml similarity index 100% rename from apps/casdoor/2.86.0/data.yml rename to apps/casdoor/2.87.0/data.yml diff --git a/apps/casdoor/2.86.0/docker-compose.yml b/apps/casdoor/2.87.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.86.0/docker-compose.yml rename to apps/casdoor/2.87.0/docker-compose.yml diff --git a/apps/casdoor/2.86.0/envs/casdoor.env b/apps/casdoor/2.87.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.86.0/envs/casdoor.env rename to apps/casdoor/2.87.0/envs/casdoor.env diff --git a/apps/casdoor/2.86.0/envs/default.env b/apps/casdoor/2.87.0/envs/default.env similarity index 100% rename from apps/casdoor/2.86.0/envs/default.env rename to apps/casdoor/2.87.0/envs/default.env diff --git a/apps/casdoor/2.86.0/envs/global.env b/apps/casdoor/2.87.0/envs/global.env similarity index 100% rename from apps/casdoor/2.86.0/envs/global.env rename to apps/casdoor/2.87.0/envs/global.env diff --git a/apps/casdoor/2.86.0/scripts/init.sh b/apps/casdoor/2.87.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.86.0/scripts/init.sh rename to apps/casdoor/2.87.0/scripts/init.sh diff --git a/apps/casdoor/2.86.0/scripts/uninstall.sh b/apps/casdoor/2.87.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.86.0/scripts/uninstall.sh rename to apps/casdoor/2.87.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.86.0/scripts/upgrade.sh b/apps/casdoor/2.87.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.86.0/scripts/upgrade.sh rename to apps/casdoor/2.87.0/scripts/upgrade.sh From afb1d7a23362e7396b62d3cbb9ecd56310b3e4c2 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 17 Oct 2025 18:28:17 +0000 Subject: [PATCH 205/262] Processed apps directory via GitHub Actions --- appstore/casdoor/{2.86.0 => 2.87.0}/.env | 0 appstore/casdoor/{2.86.0 => 2.87.0}/config/init_data.json | 0 appstore/casdoor/{2.86.0 => 2.87.0}/data.yml | 0 appstore/casdoor/{2.86.0 => 2.87.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.86.0 => 2.87.0}/envs/casdoor.env | 0 appstore/casdoor/{2.86.0 => 2.87.0}/envs/default.env | 0 appstore/casdoor/{2.86.0 => 2.87.0}/envs/global.env | 0 appstore/casdoor/{2.86.0 => 2.87.0}/scripts/init.sh | 0 appstore/casdoor/{2.86.0 => 2.87.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.86.0 => 2.87.0}/scripts/upgrade.sh | 0 dockge/casdoor/docker-compose.yml | 2 +- 11 files changed, 2 insertions(+), 2 deletions(-) rename appstore/casdoor/{2.86.0 => 2.87.0}/.env (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/config/init_data.json (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/data.yml (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.86.0 => 2.87.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/envs/default.env (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/envs/global.env (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.86.0 => 2.87.0}/scripts/upgrade.sh (100%) diff --git a/appstore/casdoor/2.86.0/.env b/appstore/casdoor/2.87.0/.env similarity index 100% rename from appstore/casdoor/2.86.0/.env rename to appstore/casdoor/2.87.0/.env diff --git a/appstore/casdoor/2.86.0/config/init_data.json b/appstore/casdoor/2.87.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.86.0/config/init_data.json rename to appstore/casdoor/2.87.0/config/init_data.json diff --git a/appstore/casdoor/2.86.0/data.yml b/appstore/casdoor/2.87.0/data.yml similarity index 100% rename from appstore/casdoor/2.86.0/data.yml rename to appstore/casdoor/2.87.0/data.yml diff --git a/appstore/casdoor/2.86.0/docker-compose.yml b/appstore/casdoor/2.87.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.86.0/docker-compose.yml rename to appstore/casdoor/2.87.0/docker-compose.yml index a514b20af..1d782de9a 100644 --- a/appstore/casdoor/2.86.0/docker-compose.yml +++ b/appstore/casdoor/2.87.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.86.0 + image: casbin/casdoor:v2.87.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.86.0/envs/casdoor.env b/appstore/casdoor/2.87.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.86.0/envs/casdoor.env rename to appstore/casdoor/2.87.0/envs/casdoor.env diff --git a/appstore/casdoor/2.86.0/envs/default.env b/appstore/casdoor/2.87.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.86.0/envs/default.env rename to appstore/casdoor/2.87.0/envs/default.env diff --git a/appstore/casdoor/2.86.0/envs/global.env b/appstore/casdoor/2.87.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.86.0/envs/global.env rename to appstore/casdoor/2.87.0/envs/global.env diff --git a/appstore/casdoor/2.86.0/scripts/init.sh b/appstore/casdoor/2.87.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.86.0/scripts/init.sh rename to appstore/casdoor/2.87.0/scripts/init.sh diff --git a/appstore/casdoor/2.86.0/scripts/uninstall.sh b/appstore/casdoor/2.87.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.86.0/scripts/uninstall.sh rename to appstore/casdoor/2.87.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.86.0/scripts/upgrade.sh b/appstore/casdoor/2.87.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.86.0/scripts/upgrade.sh rename to appstore/casdoor/2.87.0/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index a514b20af..1d782de9a 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.86.0 + image: casbin/casdoor:v2.87.0 labels: createdBy: Apps networks: From 5d4b253919d6fe8a0b0fe5989bb6a266aea1d754 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 18:30:50 +0000 Subject: [PATCH 206/262] Update casbin/casdoor Docker tag to v2.88.0 --- apps/casdoor/2.87.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/2.87.0/docker-compose.yml b/apps/casdoor/2.87.0/docker-compose.yml index c0763216c..d87b0d164 100644 --- a/apps/casdoor/2.87.0/docker-compose.yml +++ b/apps/casdoor/2.87.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v2.87.0 + image: casbin/casdoor:v2.88.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 46cc6622370f2798262fbb5b7ed95ced1e91ec1e Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 18:31:08 +0000 Subject: [PATCH 207/262] Update app version [skip ci] --- apps/casdoor/{2.87.0 => 2.88.0}/config/init_data.json | 0 apps/casdoor/{2.87.0 => 2.88.0}/data.yml | 0 apps/casdoor/{2.87.0 => 2.88.0}/docker-compose.yml | 0 apps/casdoor/{2.87.0 => 2.88.0}/envs/casdoor.env | 0 apps/casdoor/{2.87.0 => 2.88.0}/envs/default.env | 0 apps/casdoor/{2.87.0 => 2.88.0}/envs/global.env | 0 apps/casdoor/{2.87.0 => 2.88.0}/scripts/init.sh | 0 apps/casdoor/{2.87.0 => 2.88.0}/scripts/uninstall.sh | 0 apps/casdoor/{2.87.0 => 2.88.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{2.87.0 => 2.88.0}/config/init_data.json (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/data.yml (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/docker-compose.yml (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/envs/casdoor.env (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/envs/default.env (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/envs/global.env (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/scripts/init.sh (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{2.87.0 => 2.88.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/2.87.0/config/init_data.json b/apps/casdoor/2.88.0/config/init_data.json similarity index 100% rename from apps/casdoor/2.87.0/config/init_data.json rename to apps/casdoor/2.88.0/config/init_data.json diff --git a/apps/casdoor/2.87.0/data.yml b/apps/casdoor/2.88.0/data.yml similarity index 100% rename from apps/casdoor/2.87.0/data.yml rename to apps/casdoor/2.88.0/data.yml diff --git a/apps/casdoor/2.87.0/docker-compose.yml b/apps/casdoor/2.88.0/docker-compose.yml similarity index 100% rename from apps/casdoor/2.87.0/docker-compose.yml rename to apps/casdoor/2.88.0/docker-compose.yml diff --git a/apps/casdoor/2.87.0/envs/casdoor.env b/apps/casdoor/2.88.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/2.87.0/envs/casdoor.env rename to apps/casdoor/2.88.0/envs/casdoor.env diff --git a/apps/casdoor/2.87.0/envs/default.env b/apps/casdoor/2.88.0/envs/default.env similarity index 100% rename from apps/casdoor/2.87.0/envs/default.env rename to apps/casdoor/2.88.0/envs/default.env diff --git a/apps/casdoor/2.87.0/envs/global.env b/apps/casdoor/2.88.0/envs/global.env similarity index 100% rename from apps/casdoor/2.87.0/envs/global.env rename to apps/casdoor/2.88.0/envs/global.env diff --git a/apps/casdoor/2.87.0/scripts/init.sh b/apps/casdoor/2.88.0/scripts/init.sh similarity index 100% rename from apps/casdoor/2.87.0/scripts/init.sh rename to apps/casdoor/2.88.0/scripts/init.sh diff --git a/apps/casdoor/2.87.0/scripts/uninstall.sh b/apps/casdoor/2.88.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/2.87.0/scripts/uninstall.sh rename to apps/casdoor/2.88.0/scripts/uninstall.sh diff --git a/apps/casdoor/2.87.0/scripts/upgrade.sh b/apps/casdoor/2.88.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/2.87.0/scripts/upgrade.sh rename to apps/casdoor/2.88.0/scripts/upgrade.sh From e48e756c9b95b212702b141e9dd04cc3df48099a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 18:32:25 +0000 Subject: [PATCH 208/262] Update amir20/dozzle Docker tag to v8.14.5 --- apps/dozzle/8.14.4/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dozzle/8.14.4/docker-compose.yml b/apps/dozzle/8.14.4/docker-compose.yml index b3b97b1c9..06d70140e 100644 --- a/apps/dozzle/8.14.4/docker-compose.yml +++ b/apps/dozzle/8.14.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: dozzle: - image: amir20/dozzle:v8.14.4 + image: amir20/dozzle:v8.14.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 90b62adefde38360adfa2d297bd7f47c2495e78b Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 18:33:01 +0000 Subject: [PATCH 209/262] Update app version [skip ci] --- apps/dozzle/{8.14.4 => 8.14.5}/data.yml | 0 apps/dozzle/{8.14.4 => 8.14.5}/docker-compose.yml | 0 apps/dozzle/{8.14.4 => 8.14.5}/envs/default.env | 0 apps/dozzle/{8.14.4 => 8.14.5}/envs/global.env | 0 apps/dozzle/{8.14.4 => 8.14.5}/scripts/init.sh | 0 apps/dozzle/{8.14.4 => 8.14.5}/scripts/uninstall.sh | 0 apps/dozzle/{8.14.4 => 8.14.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/dozzle/{8.14.4 => 8.14.5}/data.yml (100%) rename apps/dozzle/{8.14.4 => 8.14.5}/docker-compose.yml (100%) rename apps/dozzle/{8.14.4 => 8.14.5}/envs/default.env (100%) rename apps/dozzle/{8.14.4 => 8.14.5}/envs/global.env (100%) rename apps/dozzle/{8.14.4 => 8.14.5}/scripts/init.sh (100%) rename apps/dozzle/{8.14.4 => 8.14.5}/scripts/uninstall.sh (100%) rename apps/dozzle/{8.14.4 => 8.14.5}/scripts/upgrade.sh (100%) diff --git a/apps/dozzle/8.14.4/data.yml b/apps/dozzle/8.14.5/data.yml similarity index 100% rename from apps/dozzle/8.14.4/data.yml rename to apps/dozzle/8.14.5/data.yml diff --git a/apps/dozzle/8.14.4/docker-compose.yml b/apps/dozzle/8.14.5/docker-compose.yml similarity index 100% rename from apps/dozzle/8.14.4/docker-compose.yml rename to apps/dozzle/8.14.5/docker-compose.yml diff --git a/apps/dozzle/8.14.4/envs/default.env b/apps/dozzle/8.14.5/envs/default.env similarity index 100% rename from apps/dozzle/8.14.4/envs/default.env rename to apps/dozzle/8.14.5/envs/default.env diff --git a/apps/dozzle/8.14.4/envs/global.env b/apps/dozzle/8.14.5/envs/global.env similarity index 100% rename from apps/dozzle/8.14.4/envs/global.env rename to apps/dozzle/8.14.5/envs/global.env diff --git a/apps/dozzle/8.14.4/scripts/init.sh b/apps/dozzle/8.14.5/scripts/init.sh similarity index 100% rename from apps/dozzle/8.14.4/scripts/init.sh rename to apps/dozzle/8.14.5/scripts/init.sh diff --git a/apps/dozzle/8.14.4/scripts/uninstall.sh b/apps/dozzle/8.14.5/scripts/uninstall.sh similarity index 100% rename from apps/dozzle/8.14.4/scripts/uninstall.sh rename to apps/dozzle/8.14.5/scripts/uninstall.sh diff --git a/apps/dozzle/8.14.4/scripts/upgrade.sh b/apps/dozzle/8.14.5/scripts/upgrade.sh similarity index 100% rename from apps/dozzle/8.14.4/scripts/upgrade.sh rename to apps/dozzle/8.14.5/scripts/upgrade.sh From 92f6bb94b07559aaca6d9e0aa55fca634fddb66d Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 17 Oct 2025 21:18:29 +0000 Subject: [PATCH 210/262] Processed apps directory via GitHub Actions --- appstore/casdoor/{2.87.0 => 2.88.0}/.env | 0 appstore/casdoor/{2.87.0 => 2.88.0}/config/init_data.json | 0 appstore/casdoor/{2.87.0 => 2.88.0}/data.yml | 0 appstore/casdoor/{2.87.0 => 2.88.0}/docker-compose.yml | 2 +- appstore/casdoor/{2.87.0 => 2.88.0}/envs/casdoor.env | 0 appstore/casdoor/{2.87.0 => 2.88.0}/envs/default.env | 0 appstore/casdoor/{2.87.0 => 2.88.0}/envs/global.env | 0 appstore/casdoor/{2.87.0 => 2.88.0}/scripts/init.sh | 0 appstore/casdoor/{2.87.0 => 2.88.0}/scripts/uninstall.sh | 0 appstore/casdoor/{2.87.0 => 2.88.0}/scripts/upgrade.sh | 0 appstore/dozzle/{8.14.4 => 8.14.5}/.env | 0 appstore/dozzle/{8.14.4 => 8.14.5}/data.yml | 0 appstore/dozzle/{8.14.4 => 8.14.5}/docker-compose.yml | 2 +- appstore/dozzle/{8.14.4 => 8.14.5}/envs/default.env | 0 appstore/dozzle/{8.14.4 => 8.14.5}/envs/global.env | 0 appstore/dozzle/{8.14.4 => 8.14.5}/scripts/init.sh | 0 appstore/dozzle/{8.14.4 => 8.14.5}/scripts/uninstall.sh | 0 appstore/dozzle/{8.14.4 => 8.14.5}/scripts/upgrade.sh | 0 dockge/casdoor/docker-compose.yml | 2 +- dockge/dozzle/docker-compose.yml | 2 +- 20 files changed, 4 insertions(+), 4 deletions(-) rename appstore/casdoor/{2.87.0 => 2.88.0}/.env (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/config/init_data.json (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/data.yml (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/docker-compose.yml (93%) rename appstore/casdoor/{2.87.0 => 2.88.0}/envs/casdoor.env (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/envs/default.env (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/envs/global.env (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/scripts/init.sh (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{2.87.0 => 2.88.0}/scripts/upgrade.sh (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/.env (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/data.yml (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/docker-compose.yml (94%) rename appstore/dozzle/{8.14.4 => 8.14.5}/envs/default.env (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/envs/global.env (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/scripts/init.sh (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/scripts/uninstall.sh (100%) rename appstore/dozzle/{8.14.4 => 8.14.5}/scripts/upgrade.sh (100%) diff --git a/appstore/casdoor/2.87.0/.env b/appstore/casdoor/2.88.0/.env similarity index 100% rename from appstore/casdoor/2.87.0/.env rename to appstore/casdoor/2.88.0/.env diff --git a/appstore/casdoor/2.87.0/config/init_data.json b/appstore/casdoor/2.88.0/config/init_data.json similarity index 100% rename from appstore/casdoor/2.87.0/config/init_data.json rename to appstore/casdoor/2.88.0/config/init_data.json diff --git a/appstore/casdoor/2.87.0/data.yml b/appstore/casdoor/2.88.0/data.yml similarity index 100% rename from appstore/casdoor/2.87.0/data.yml rename to appstore/casdoor/2.88.0/data.yml diff --git a/appstore/casdoor/2.87.0/docker-compose.yml b/appstore/casdoor/2.88.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/2.87.0/docker-compose.yml rename to appstore/casdoor/2.88.0/docker-compose.yml index 1d782de9a..82b919c37 100644 --- a/appstore/casdoor/2.87.0/docker-compose.yml +++ b/appstore/casdoor/2.88.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.87.0 + image: casbin/casdoor:v2.88.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/2.87.0/envs/casdoor.env b/appstore/casdoor/2.88.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/2.87.0/envs/casdoor.env rename to appstore/casdoor/2.88.0/envs/casdoor.env diff --git a/appstore/casdoor/2.87.0/envs/default.env b/appstore/casdoor/2.88.0/envs/default.env similarity index 100% rename from appstore/casdoor/2.87.0/envs/default.env rename to appstore/casdoor/2.88.0/envs/default.env diff --git a/appstore/casdoor/2.87.0/envs/global.env b/appstore/casdoor/2.88.0/envs/global.env similarity index 100% rename from appstore/casdoor/2.87.0/envs/global.env rename to appstore/casdoor/2.88.0/envs/global.env diff --git a/appstore/casdoor/2.87.0/scripts/init.sh b/appstore/casdoor/2.88.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/2.87.0/scripts/init.sh rename to appstore/casdoor/2.88.0/scripts/init.sh diff --git a/appstore/casdoor/2.87.0/scripts/uninstall.sh b/appstore/casdoor/2.88.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/2.87.0/scripts/uninstall.sh rename to appstore/casdoor/2.88.0/scripts/uninstall.sh diff --git a/appstore/casdoor/2.87.0/scripts/upgrade.sh b/appstore/casdoor/2.88.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/2.87.0/scripts/upgrade.sh rename to appstore/casdoor/2.88.0/scripts/upgrade.sh diff --git a/appstore/dozzle/8.14.4/.env b/appstore/dozzle/8.14.5/.env similarity index 100% rename from appstore/dozzle/8.14.4/.env rename to appstore/dozzle/8.14.5/.env diff --git a/appstore/dozzle/8.14.4/data.yml b/appstore/dozzle/8.14.5/data.yml similarity index 100% rename from appstore/dozzle/8.14.4/data.yml rename to appstore/dozzle/8.14.5/data.yml diff --git a/appstore/dozzle/8.14.4/docker-compose.yml b/appstore/dozzle/8.14.5/docker-compose.yml similarity index 94% rename from appstore/dozzle/8.14.4/docker-compose.yml rename to appstore/dozzle/8.14.5/docker-compose.yml index d576e5c87..28be32a41 100644 --- a/appstore/dozzle/8.14.4/docker-compose.yml +++ b/appstore/dozzle/8.14.5/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.14.4 + image: amir20/dozzle:v8.14.5 labels: createdBy: Apps networks: diff --git a/appstore/dozzle/8.14.4/envs/default.env b/appstore/dozzle/8.14.5/envs/default.env similarity index 100% rename from appstore/dozzle/8.14.4/envs/default.env rename to appstore/dozzle/8.14.5/envs/default.env diff --git a/appstore/dozzle/8.14.4/envs/global.env b/appstore/dozzle/8.14.5/envs/global.env similarity index 100% rename from appstore/dozzle/8.14.4/envs/global.env rename to appstore/dozzle/8.14.5/envs/global.env diff --git a/appstore/dozzle/8.14.4/scripts/init.sh b/appstore/dozzle/8.14.5/scripts/init.sh similarity index 100% rename from appstore/dozzle/8.14.4/scripts/init.sh rename to appstore/dozzle/8.14.5/scripts/init.sh diff --git a/appstore/dozzle/8.14.4/scripts/uninstall.sh b/appstore/dozzle/8.14.5/scripts/uninstall.sh similarity index 100% rename from appstore/dozzle/8.14.4/scripts/uninstall.sh rename to appstore/dozzle/8.14.5/scripts/uninstall.sh diff --git a/appstore/dozzle/8.14.4/scripts/upgrade.sh b/appstore/dozzle/8.14.5/scripts/upgrade.sh similarity index 100% rename from appstore/dozzle/8.14.4/scripts/upgrade.sh rename to appstore/dozzle/8.14.5/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 1d782de9a..82b919c37 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v2.87.0 + image: casbin/casdoor:v2.88.0 labels: createdBy: Apps networks: diff --git a/dockge/dozzle/docker-compose.yml b/dockge/dozzle/docker-compose.yml index d576e5c87..28be32a41 100644 --- a/dockge/dozzle/docker-compose.yml +++ b/dockge/dozzle/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.14.4 + image: amir20/dozzle:v8.14.5 labels: createdBy: Apps networks: From ea7e7928a36d75ec496127a656bb65e24573154c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 21:20:54 +0000 Subject: [PATCH 211/262] Update ghcr.io/homarr-labs/homarr Docker tag to v1.42.0 --- apps/homarr/1.41.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/homarr/1.41.0/docker-compose.yml b/apps/homarr/1.41.0/docker-compose.yml index 9ae0f6f09..bd3f0267f 100644 --- a/apps/homarr/1.41.0/docker-compose.yml +++ b/apps/homarr/1.41.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: homarr: - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/homarr-labs/homarr:v1.42.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 741e9d10bbc36741e3139a106d4f77b831a6ee6d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 21:21:00 +0000 Subject: [PATCH 212/262] Update linuxserver/radarr Docker tag to v5.28.0 --- apps/radarr/5.27.5/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/radarr/5.27.5/docker-compose.yml b/apps/radarr/5.27.5/docker-compose.yml index 5fe047e3a..c2a66491c 100644 --- a/apps/radarr/5.27.5/docker-compose.yml +++ b/apps/radarr/5.27.5/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: radarr: - image: linuxserver/radarr:5.27.5 + image: linuxserver/radarr:5.28.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 9a564d546b49b176d651e4fd9688ca45437877e9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 21:21:06 +0000 Subject: [PATCH 213/262] Update app version [skip ci] --- apps/homarr/{1.41.0 => 1.42.0}/data.yml | 0 apps/homarr/{1.41.0 => 1.42.0}/docker-compose.yml | 0 apps/homarr/{1.41.0 => 1.42.0}/envs/default.env | 0 apps/homarr/{1.41.0 => 1.42.0}/envs/global.env | 0 apps/homarr/{1.41.0 => 1.42.0}/scripts/init.sh | 0 apps/homarr/{1.41.0 => 1.42.0}/scripts/uninstall.sh | 0 apps/homarr/{1.41.0 => 1.42.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/homarr/{1.41.0 => 1.42.0}/data.yml (100%) rename apps/homarr/{1.41.0 => 1.42.0}/docker-compose.yml (100%) rename apps/homarr/{1.41.0 => 1.42.0}/envs/default.env (100%) rename apps/homarr/{1.41.0 => 1.42.0}/envs/global.env (100%) rename apps/homarr/{1.41.0 => 1.42.0}/scripts/init.sh (100%) rename apps/homarr/{1.41.0 => 1.42.0}/scripts/uninstall.sh (100%) rename apps/homarr/{1.41.0 => 1.42.0}/scripts/upgrade.sh (100%) diff --git a/apps/homarr/1.41.0/data.yml b/apps/homarr/1.42.0/data.yml similarity index 100% rename from apps/homarr/1.41.0/data.yml rename to apps/homarr/1.42.0/data.yml diff --git a/apps/homarr/1.41.0/docker-compose.yml b/apps/homarr/1.42.0/docker-compose.yml similarity index 100% rename from apps/homarr/1.41.0/docker-compose.yml rename to apps/homarr/1.42.0/docker-compose.yml diff --git a/apps/homarr/1.41.0/envs/default.env b/apps/homarr/1.42.0/envs/default.env similarity index 100% rename from apps/homarr/1.41.0/envs/default.env rename to apps/homarr/1.42.0/envs/default.env diff --git a/apps/homarr/1.41.0/envs/global.env b/apps/homarr/1.42.0/envs/global.env similarity index 100% rename from apps/homarr/1.41.0/envs/global.env rename to apps/homarr/1.42.0/envs/global.env diff --git a/apps/homarr/1.41.0/scripts/init.sh b/apps/homarr/1.42.0/scripts/init.sh similarity index 100% rename from apps/homarr/1.41.0/scripts/init.sh rename to apps/homarr/1.42.0/scripts/init.sh diff --git a/apps/homarr/1.41.0/scripts/uninstall.sh b/apps/homarr/1.42.0/scripts/uninstall.sh similarity index 100% rename from apps/homarr/1.41.0/scripts/uninstall.sh rename to apps/homarr/1.42.0/scripts/uninstall.sh diff --git a/apps/homarr/1.41.0/scripts/upgrade.sh b/apps/homarr/1.42.0/scripts/upgrade.sh similarity index 100% rename from apps/homarr/1.41.0/scripts/upgrade.sh rename to apps/homarr/1.42.0/scripts/upgrade.sh From 41e74ebc80112903160bd3c6e5a81cdd0a0a62f9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 17 Oct 2025 21:21:09 +0000 Subject: [PATCH 214/262] Update app version [skip ci] --- apps/radarr/{5.27.5 => 5.28.0}/data.yml | 0 apps/radarr/{5.27.5 => 5.28.0}/docker-compose.yml | 0 apps/radarr/{5.27.5 => 5.28.0}/envs/default.env | 0 apps/radarr/{5.27.5 => 5.28.0}/envs/global.env | 0 apps/radarr/{5.27.5 => 5.28.0}/scripts/init.sh | 0 apps/radarr/{5.27.5 => 5.28.0}/scripts/uninstall.sh | 0 apps/radarr/{5.27.5 => 5.28.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/radarr/{5.27.5 => 5.28.0}/data.yml (100%) rename apps/radarr/{5.27.5 => 5.28.0}/docker-compose.yml (100%) rename apps/radarr/{5.27.5 => 5.28.0}/envs/default.env (100%) rename apps/radarr/{5.27.5 => 5.28.0}/envs/global.env (100%) rename apps/radarr/{5.27.5 => 5.28.0}/scripts/init.sh (100%) rename apps/radarr/{5.27.5 => 5.28.0}/scripts/uninstall.sh (100%) rename apps/radarr/{5.27.5 => 5.28.0}/scripts/upgrade.sh (100%) diff --git a/apps/radarr/5.27.5/data.yml b/apps/radarr/5.28.0/data.yml similarity index 100% rename from apps/radarr/5.27.5/data.yml rename to apps/radarr/5.28.0/data.yml diff --git a/apps/radarr/5.27.5/docker-compose.yml b/apps/radarr/5.28.0/docker-compose.yml similarity index 100% rename from apps/radarr/5.27.5/docker-compose.yml rename to apps/radarr/5.28.0/docker-compose.yml diff --git a/apps/radarr/5.27.5/envs/default.env b/apps/radarr/5.28.0/envs/default.env similarity index 100% rename from apps/radarr/5.27.5/envs/default.env rename to apps/radarr/5.28.0/envs/default.env diff --git a/apps/radarr/5.27.5/envs/global.env b/apps/radarr/5.28.0/envs/global.env similarity index 100% rename from apps/radarr/5.27.5/envs/global.env rename to apps/radarr/5.28.0/envs/global.env diff --git a/apps/radarr/5.27.5/scripts/init.sh b/apps/radarr/5.28.0/scripts/init.sh similarity index 100% rename from apps/radarr/5.27.5/scripts/init.sh rename to apps/radarr/5.28.0/scripts/init.sh diff --git a/apps/radarr/5.27.5/scripts/uninstall.sh b/apps/radarr/5.28.0/scripts/uninstall.sh similarity index 100% rename from apps/radarr/5.27.5/scripts/uninstall.sh rename to apps/radarr/5.28.0/scripts/uninstall.sh diff --git a/apps/radarr/5.27.5/scripts/upgrade.sh b/apps/radarr/5.28.0/scripts/upgrade.sh similarity index 100% rename from apps/radarr/5.27.5/scripts/upgrade.sh rename to apps/radarr/5.28.0/scripts/upgrade.sh From 4146994e36eb6d24dfb01ce8db13df4d88a295c1 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 18 Oct 2025 01:36:06 +0000 Subject: [PATCH 215/262] Processed apps directory via GitHub Actions --- appstore/homarr/{1.41.0 => 1.42.0}/.env | 0 appstore/homarr/{1.41.0 => 1.42.0}/data.yml | 0 appstore/homarr/{1.41.0 => 1.42.0}/docker-compose.yml | 2 +- appstore/homarr/{1.41.0 => 1.42.0}/envs/default.env | 0 appstore/homarr/{1.41.0 => 1.42.0}/envs/global.env | 0 appstore/homarr/{1.41.0 => 1.42.0}/scripts/init.sh | 0 appstore/homarr/{1.41.0 => 1.42.0}/scripts/uninstall.sh | 0 appstore/homarr/{1.41.0 => 1.42.0}/scripts/upgrade.sh | 0 appstore/radarr/{5.27.5 => 5.28.0}/.env | 0 appstore/radarr/{5.27.5 => 5.28.0}/data.yml | 0 appstore/radarr/{5.27.5 => 5.28.0}/docker-compose.yml | 2 +- appstore/radarr/{5.27.5 => 5.28.0}/envs/default.env | 0 appstore/radarr/{5.27.5 => 5.28.0}/envs/global.env | 0 appstore/radarr/{5.27.5 => 5.28.0}/scripts/init.sh | 0 appstore/radarr/{5.27.5 => 5.28.0}/scripts/uninstall.sh | 0 appstore/radarr/{5.27.5 => 5.28.0}/scripts/upgrade.sh | 0 dockge/homarr/docker-compose.yml | 2 +- dockge/radarr/docker-compose.yml | 2 +- 18 files changed, 4 insertions(+), 4 deletions(-) rename appstore/homarr/{1.41.0 => 1.42.0}/.env (100%) rename appstore/homarr/{1.41.0 => 1.42.0}/data.yml (100%) rename appstore/homarr/{1.41.0 => 1.42.0}/docker-compose.yml (89%) rename appstore/homarr/{1.41.0 => 1.42.0}/envs/default.env (100%) rename appstore/homarr/{1.41.0 => 1.42.0}/envs/global.env (100%) rename appstore/homarr/{1.41.0 => 1.42.0}/scripts/init.sh (100%) rename appstore/homarr/{1.41.0 => 1.42.0}/scripts/uninstall.sh (100%) rename appstore/homarr/{1.41.0 => 1.42.0}/scripts/upgrade.sh (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/.env (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/data.yml (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/docker-compose.yml (95%) rename appstore/radarr/{5.27.5 => 5.28.0}/envs/default.env (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/envs/global.env (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/scripts/init.sh (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/scripts/uninstall.sh (100%) rename appstore/radarr/{5.27.5 => 5.28.0}/scripts/upgrade.sh (100%) diff --git a/appstore/homarr/1.41.0/.env b/appstore/homarr/1.42.0/.env similarity index 100% rename from appstore/homarr/1.41.0/.env rename to appstore/homarr/1.42.0/.env diff --git a/appstore/homarr/1.41.0/data.yml b/appstore/homarr/1.42.0/data.yml similarity index 100% rename from appstore/homarr/1.41.0/data.yml rename to appstore/homarr/1.42.0/data.yml diff --git a/appstore/homarr/1.41.0/docker-compose.yml b/appstore/homarr/1.42.0/docker-compose.yml similarity index 89% rename from appstore/homarr/1.41.0/docker-compose.yml rename to appstore/homarr/1.42.0/docker-compose.yml index 06b42b32c..d7eae2c2d 100644 --- a/appstore/homarr/1.41.0/docker-compose.yml +++ b/appstore/homarr/1.42.0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/homarr-labs/homarr:v1.42.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/homarr/1.41.0/envs/default.env b/appstore/homarr/1.42.0/envs/default.env similarity index 100% rename from appstore/homarr/1.41.0/envs/default.env rename to appstore/homarr/1.42.0/envs/default.env diff --git a/appstore/homarr/1.41.0/envs/global.env b/appstore/homarr/1.42.0/envs/global.env similarity index 100% rename from appstore/homarr/1.41.0/envs/global.env rename to appstore/homarr/1.42.0/envs/global.env diff --git a/appstore/homarr/1.41.0/scripts/init.sh b/appstore/homarr/1.42.0/scripts/init.sh similarity index 100% rename from appstore/homarr/1.41.0/scripts/init.sh rename to appstore/homarr/1.42.0/scripts/init.sh diff --git a/appstore/homarr/1.41.0/scripts/uninstall.sh b/appstore/homarr/1.42.0/scripts/uninstall.sh similarity index 100% rename from appstore/homarr/1.41.0/scripts/uninstall.sh rename to appstore/homarr/1.42.0/scripts/uninstall.sh diff --git a/appstore/homarr/1.41.0/scripts/upgrade.sh b/appstore/homarr/1.42.0/scripts/upgrade.sh similarity index 100% rename from appstore/homarr/1.41.0/scripts/upgrade.sh rename to appstore/homarr/1.42.0/scripts/upgrade.sh diff --git a/appstore/radarr/5.27.5/.env b/appstore/radarr/5.28.0/.env similarity index 100% rename from appstore/radarr/5.27.5/.env rename to appstore/radarr/5.28.0/.env diff --git a/appstore/radarr/5.27.5/data.yml b/appstore/radarr/5.28.0/data.yml similarity index 100% rename from appstore/radarr/5.27.5/data.yml rename to appstore/radarr/5.28.0/data.yml diff --git a/appstore/radarr/5.27.5/docker-compose.yml b/appstore/radarr/5.28.0/docker-compose.yml similarity index 95% rename from appstore/radarr/5.27.5/docker-compose.yml rename to appstore/radarr/5.28.0/docker-compose.yml index 15de4e9ca..d0858f37b 100644 --- a/appstore/radarr/5.27.5/docker-compose.yml +++ b/appstore/radarr/5.28.0/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=1000 - UMASK=022 - TZ=Asia/Shanghai - image: linuxserver/radarr:5.27.5 + image: linuxserver/radarr:5.28.0 labels: createdBy: Apps networks: diff --git a/appstore/radarr/5.27.5/envs/default.env b/appstore/radarr/5.28.0/envs/default.env similarity index 100% rename from appstore/radarr/5.27.5/envs/default.env rename to appstore/radarr/5.28.0/envs/default.env diff --git a/appstore/radarr/5.27.5/envs/global.env b/appstore/radarr/5.28.0/envs/global.env similarity index 100% rename from appstore/radarr/5.27.5/envs/global.env rename to appstore/radarr/5.28.0/envs/global.env diff --git a/appstore/radarr/5.27.5/scripts/init.sh b/appstore/radarr/5.28.0/scripts/init.sh similarity index 100% rename from appstore/radarr/5.27.5/scripts/init.sh rename to appstore/radarr/5.28.0/scripts/init.sh diff --git a/appstore/radarr/5.27.5/scripts/uninstall.sh b/appstore/radarr/5.28.0/scripts/uninstall.sh similarity index 100% rename from appstore/radarr/5.27.5/scripts/uninstall.sh rename to appstore/radarr/5.28.0/scripts/uninstall.sh diff --git a/appstore/radarr/5.27.5/scripts/upgrade.sh b/appstore/radarr/5.28.0/scripts/upgrade.sh similarity index 100% rename from appstore/radarr/5.27.5/scripts/upgrade.sh rename to appstore/radarr/5.28.0/scripts/upgrade.sh diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 06b42b32c..d7eae2c2d 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.41.0 + image: ghcr.io/homarr-labs/homarr:v1.42.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/radarr/docker-compose.yml b/dockge/radarr/docker-compose.yml index 15de4e9ca..d0858f37b 100644 --- a/dockge/radarr/docker-compose.yml +++ b/dockge/radarr/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=1000 - UMASK=022 - TZ=Asia/Shanghai - image: linuxserver/radarr:5.27.5 + image: linuxserver/radarr:5.28.0 labels: createdBy: Apps networks: From 6a82ea37c44363f2de3a09b3ee41df2dd7d7b0b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Oct 2025 01:38:47 +0000 Subject: [PATCH 216/262] Update emby/embyserver Docker tag to v4.9.2.5 --- apps/emby/4.9.2.4/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emby/4.9.2.4/docker-compose.yml b/apps/emby/4.9.2.4/docker-compose.yml index f1f347b57..e9d67456f 100644 --- a/apps/emby/4.9.2.4/docker-compose.yml +++ b/apps/emby/4.9.2.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby: - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.9.2.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 54cce92ea4132402f0dacd89d364811a9db72813 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 18 Oct 2025 01:38:57 +0000 Subject: [PATCH 217/262] Update app version [skip ci] --- apps/emby/{4.9.2.4 => 4.9.2.5}/data.yml | 0 apps/emby/{4.9.2.4 => 4.9.2.5}/docker-compose.yml | 0 apps/emby/{4.9.2.4 => 4.9.2.5}/envs/default.env | 0 apps/emby/{4.9.2.4 => 4.9.2.5}/envs/global.env | 0 apps/emby/{4.9.2.4 => 4.9.2.5}/scripts/init.sh | 0 apps/emby/{4.9.2.4 => 4.9.2.5}/scripts/uninstall.sh | 0 apps/emby/{4.9.2.4 => 4.9.2.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/emby/{4.9.2.4 => 4.9.2.5}/data.yml (100%) rename apps/emby/{4.9.2.4 => 4.9.2.5}/docker-compose.yml (100%) rename apps/emby/{4.9.2.4 => 4.9.2.5}/envs/default.env (100%) rename apps/emby/{4.9.2.4 => 4.9.2.5}/envs/global.env (100%) rename apps/emby/{4.9.2.4 => 4.9.2.5}/scripts/init.sh (100%) rename apps/emby/{4.9.2.4 => 4.9.2.5}/scripts/uninstall.sh (100%) rename apps/emby/{4.9.2.4 => 4.9.2.5}/scripts/upgrade.sh (100%) diff --git a/apps/emby/4.9.2.4/data.yml b/apps/emby/4.9.2.5/data.yml similarity index 100% rename from apps/emby/4.9.2.4/data.yml rename to apps/emby/4.9.2.5/data.yml diff --git a/apps/emby/4.9.2.4/docker-compose.yml b/apps/emby/4.9.2.5/docker-compose.yml similarity index 100% rename from apps/emby/4.9.2.4/docker-compose.yml rename to apps/emby/4.9.2.5/docker-compose.yml diff --git a/apps/emby/4.9.2.4/envs/default.env b/apps/emby/4.9.2.5/envs/default.env similarity index 100% rename from apps/emby/4.9.2.4/envs/default.env rename to apps/emby/4.9.2.5/envs/default.env diff --git a/apps/emby/4.9.2.4/envs/global.env b/apps/emby/4.9.2.5/envs/global.env similarity index 100% rename from apps/emby/4.9.2.4/envs/global.env rename to apps/emby/4.9.2.5/envs/global.env diff --git a/apps/emby/4.9.2.4/scripts/init.sh b/apps/emby/4.9.2.5/scripts/init.sh similarity index 100% rename from apps/emby/4.9.2.4/scripts/init.sh rename to apps/emby/4.9.2.5/scripts/init.sh diff --git a/apps/emby/4.9.2.4/scripts/uninstall.sh b/apps/emby/4.9.2.5/scripts/uninstall.sh similarity index 100% rename from apps/emby/4.9.2.4/scripts/uninstall.sh rename to apps/emby/4.9.2.5/scripts/uninstall.sh diff --git a/apps/emby/4.9.2.4/scripts/upgrade.sh b/apps/emby/4.9.2.5/scripts/upgrade.sh similarity index 100% rename from apps/emby/4.9.2.4/scripts/upgrade.sh rename to apps/emby/4.9.2.5/scripts/upgrade.sh From d834f5bde275c11f92b9fdb61008c4b76b900d85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Oct 2025 03:04:29 +0000 Subject: [PATCH 218/262] Update ghost Docker tag to v6.4.0 --- apps/ghost/6.3.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ghost/6.3.1/docker-compose.yml b/apps/ghost/6.3.1/docker-compose.yml index ba0ecb054..fd1a1e90f 100644 --- a/apps/ghost/6.3.1/docker-compose.yml +++ b/apps/ghost/6.3.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ghost: - image: ghost:6.3.1 + image: ghost:6.4.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 4fbd0264ff9a6c09e65b817c4c5ebe22cfe77056 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 18 Oct 2025 03:04:41 +0000 Subject: [PATCH 219/262] Update app version [skip ci] --- apps/ghost/{6.3.1 => 6.4.0}/data.yml | 0 apps/ghost/{6.3.1 => 6.4.0}/docker-compose.yml | 0 apps/ghost/{6.3.1 => 6.4.0}/envs/default.env | 0 apps/ghost/{6.3.1 => 6.4.0}/envs/global.env | 0 apps/ghost/{6.3.1 => 6.4.0}/scripts/init.sh | 0 apps/ghost/{6.3.1 => 6.4.0}/scripts/uninstall.sh | 0 apps/ghost/{6.3.1 => 6.4.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ghost/{6.3.1 => 6.4.0}/data.yml (100%) rename apps/ghost/{6.3.1 => 6.4.0}/docker-compose.yml (100%) rename apps/ghost/{6.3.1 => 6.4.0}/envs/default.env (100%) rename apps/ghost/{6.3.1 => 6.4.0}/envs/global.env (100%) rename apps/ghost/{6.3.1 => 6.4.0}/scripts/init.sh (100%) rename apps/ghost/{6.3.1 => 6.4.0}/scripts/uninstall.sh (100%) rename apps/ghost/{6.3.1 => 6.4.0}/scripts/upgrade.sh (100%) diff --git a/apps/ghost/6.3.1/data.yml b/apps/ghost/6.4.0/data.yml similarity index 100% rename from apps/ghost/6.3.1/data.yml rename to apps/ghost/6.4.0/data.yml diff --git a/apps/ghost/6.3.1/docker-compose.yml b/apps/ghost/6.4.0/docker-compose.yml similarity index 100% rename from apps/ghost/6.3.1/docker-compose.yml rename to apps/ghost/6.4.0/docker-compose.yml diff --git a/apps/ghost/6.3.1/envs/default.env b/apps/ghost/6.4.0/envs/default.env similarity index 100% rename from apps/ghost/6.3.1/envs/default.env rename to apps/ghost/6.4.0/envs/default.env diff --git a/apps/ghost/6.3.1/envs/global.env b/apps/ghost/6.4.0/envs/global.env similarity index 100% rename from apps/ghost/6.3.1/envs/global.env rename to apps/ghost/6.4.0/envs/global.env diff --git a/apps/ghost/6.3.1/scripts/init.sh b/apps/ghost/6.4.0/scripts/init.sh similarity index 100% rename from apps/ghost/6.3.1/scripts/init.sh rename to apps/ghost/6.4.0/scripts/init.sh diff --git a/apps/ghost/6.3.1/scripts/uninstall.sh b/apps/ghost/6.4.0/scripts/uninstall.sh similarity index 100% rename from apps/ghost/6.3.1/scripts/uninstall.sh rename to apps/ghost/6.4.0/scripts/uninstall.sh diff --git a/apps/ghost/6.3.1/scripts/upgrade.sh b/apps/ghost/6.4.0/scripts/upgrade.sh similarity index 100% rename from apps/ghost/6.3.1/scripts/upgrade.sh rename to apps/ghost/6.4.0/scripts/upgrade.sh From 795c80c0debd1281f8ed6c2987aea9fef1d3d06f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Oct 2025 03:26:17 +0000 Subject: [PATCH 220/262] Update wushuo894/ani-rss Docker tag to v2.3.1 --- apps/ani-rss/2.2.17/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/2.2.17/docker-compose.yml b/apps/ani-rss/2.2.17/docker-compose.yml index 61e3bcaa8..df7542774 100644 --- a/apps/ani-rss/2.2.17/docker-compose.yml +++ b/apps/ani-rss/2.2.17/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.2.17 + image: wushuo894/ani-rss:v2.3.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 9d0da18b1614cf704b36adb27128888e99e0da42 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 18 Oct 2025 03:26:27 +0000 Subject: [PATCH 221/262] Update app version [skip ci] --- apps/ani-rss/{2.2.17 => 2.3.1}/data.yml | 0 apps/ani-rss/{2.2.17 => 2.3.1}/docker-compose.yml | 0 apps/ani-rss/{2.2.17 => 2.3.1}/envs/default.env | 0 apps/ani-rss/{2.2.17 => 2.3.1}/envs/global.env | 0 apps/ani-rss/{2.2.17 => 2.3.1}/scripts/init.sh | 0 apps/ani-rss/{2.2.17 => 2.3.1}/scripts/uninstall.sh | 0 apps/ani-rss/{2.2.17 => 2.3.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{2.2.17 => 2.3.1}/data.yml (100%) rename apps/ani-rss/{2.2.17 => 2.3.1}/docker-compose.yml (100%) rename apps/ani-rss/{2.2.17 => 2.3.1}/envs/default.env (100%) rename apps/ani-rss/{2.2.17 => 2.3.1}/envs/global.env (100%) rename apps/ani-rss/{2.2.17 => 2.3.1}/scripts/init.sh (100%) rename apps/ani-rss/{2.2.17 => 2.3.1}/scripts/uninstall.sh (100%) rename apps/ani-rss/{2.2.17 => 2.3.1}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/2.2.17/data.yml b/apps/ani-rss/2.3.1/data.yml similarity index 100% rename from apps/ani-rss/2.2.17/data.yml rename to apps/ani-rss/2.3.1/data.yml diff --git a/apps/ani-rss/2.2.17/docker-compose.yml b/apps/ani-rss/2.3.1/docker-compose.yml similarity index 100% rename from apps/ani-rss/2.2.17/docker-compose.yml rename to apps/ani-rss/2.3.1/docker-compose.yml diff --git a/apps/ani-rss/2.2.17/envs/default.env b/apps/ani-rss/2.3.1/envs/default.env similarity index 100% rename from apps/ani-rss/2.2.17/envs/default.env rename to apps/ani-rss/2.3.1/envs/default.env diff --git a/apps/ani-rss/2.2.17/envs/global.env b/apps/ani-rss/2.3.1/envs/global.env similarity index 100% rename from apps/ani-rss/2.2.17/envs/global.env rename to apps/ani-rss/2.3.1/envs/global.env diff --git a/apps/ani-rss/2.2.17/scripts/init.sh b/apps/ani-rss/2.3.1/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.2.17/scripts/init.sh rename to apps/ani-rss/2.3.1/scripts/init.sh diff --git a/apps/ani-rss/2.2.17/scripts/uninstall.sh b/apps/ani-rss/2.3.1/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.2.17/scripts/uninstall.sh rename to apps/ani-rss/2.3.1/scripts/uninstall.sh diff --git a/apps/ani-rss/2.2.17/scripts/upgrade.sh b/apps/ani-rss/2.3.1/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.2.17/scripts/upgrade.sh rename to apps/ani-rss/2.3.1/scripts/upgrade.sh From 1e0f42a27065fb651a48578582fbc762e305e491 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 18 Oct 2025 03:29:28 +0000 Subject: [PATCH 222/262] Processed apps directory via GitHub Actions --- appstore/ani-rss/{2.2.17 => 2.3.1}/.env | 0 appstore/ani-rss/{2.2.17 => 2.3.1}/data.yml | 0 appstore/ani-rss/{2.2.17 => 2.3.1}/docker-compose.yml | 2 +- appstore/ani-rss/{2.2.17 => 2.3.1}/envs/default.env | 0 appstore/ani-rss/{2.2.17 => 2.3.1}/envs/global.env | 0 appstore/ani-rss/{2.2.17 => 2.3.1}/scripts/init.sh | 0 appstore/ani-rss/{2.2.17 => 2.3.1}/scripts/uninstall.sh | 0 appstore/ani-rss/{2.2.17 => 2.3.1}/scripts/upgrade.sh | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/.env | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/data.yml | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/docker-compose.yml | 2 +- appstore/emby/{4.9.2.4 => 4.9.2.5}/envs/default.env | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/envs/global.env | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/scripts/init.sh | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/scripts/uninstall.sh | 0 appstore/emby/{4.9.2.4 => 4.9.2.5}/scripts/upgrade.sh | 0 appstore/ghost/{6.3.1 => 6.4.0}/.env | 0 appstore/ghost/{6.3.1 => 6.4.0}/data.yml | 0 appstore/ghost/{6.3.1 => 6.4.0}/docker-compose.yml | 2 +- appstore/ghost/{6.3.1 => 6.4.0}/envs/default.env | 0 appstore/ghost/{6.3.1 => 6.4.0}/envs/global.env | 0 appstore/ghost/{6.3.1 => 6.4.0}/scripts/init.sh | 0 appstore/ghost/{6.3.1 => 6.4.0}/scripts/uninstall.sh | 0 appstore/ghost/{6.3.1 => 6.4.0}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 5 +---- dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/.env | 0 dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/docker-compose.yml | 5 ++++- dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/envs/default.env | 0 dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/envs/global.env | 0 dockge/emby/docker-compose.yml | 2 +- dockge/{emby_4_8_11_0 => emby_4_9_2_5}/.env | 0 dockge/{emby_4_8_11_0 => emby_4_9_2_5}/docker-compose.yml | 2 +- dockge/{emby_4_8_11_0 => emby_4_9_2_5}/envs/default.env | 0 dockge/{emby_4_8_11_0 => emby_4_9_2_5}/envs/global.env | 0 dockge/ghost/docker-compose.yml | 2 +- 35 files changed, 11 insertions(+), 11 deletions(-) rename appstore/ani-rss/{2.2.17 => 2.3.1}/.env (100%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/data.yml (100%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/docker-compose.yml (95%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/envs/default.env (100%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/envs/global.env (100%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/scripts/init.sh (100%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{2.2.17 => 2.3.1}/scripts/upgrade.sh (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/.env (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/data.yml (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/docker-compose.yml (96%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/envs/default.env (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/envs/global.env (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/scripts/init.sh (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/scripts/uninstall.sh (100%) rename appstore/emby/{4.9.2.4 => 4.9.2.5}/scripts/upgrade.sh (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/.env (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/data.yml (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/docker-compose.yml (95%) rename appstore/ghost/{6.3.1 => 6.4.0}/envs/default.env (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/envs/global.env (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/scripts/init.sh (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/scripts/uninstall.sh (100%) rename appstore/ghost/{6.3.1 => 6.4.0}/scripts/upgrade.sh (100%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/.env (100%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/docker-compose.yml (91%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/envs/default.env (100%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_3_1}/envs/global.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_5}/.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_5}/docker-compose.yml (96%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_5}/envs/default.env (100%) rename dockge/{emby_4_8_11_0 => emby_4_9_2_5}/envs/global.env (100%) diff --git a/appstore/ani-rss/2.2.17/.env b/appstore/ani-rss/2.3.1/.env similarity index 100% rename from appstore/ani-rss/2.2.17/.env rename to appstore/ani-rss/2.3.1/.env diff --git a/appstore/ani-rss/2.2.17/data.yml b/appstore/ani-rss/2.3.1/data.yml similarity index 100% rename from appstore/ani-rss/2.2.17/data.yml rename to appstore/ani-rss/2.3.1/data.yml diff --git a/appstore/ani-rss/2.2.17/docker-compose.yml b/appstore/ani-rss/2.3.1/docker-compose.yml similarity index 95% rename from appstore/ani-rss/2.2.17/docker-compose.yml rename to appstore/ani-rss/2.3.1/docker-compose.yml index 0206047bb..11a62d9e2 100644 --- a/appstore/ani-rss/2.2.17/docker-compose.yml +++ b/appstore/ani-rss/2.3.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.17 + image: wushuo894/ani-rss:v2.3.1 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/2.2.17/envs/default.env b/appstore/ani-rss/2.3.1/envs/default.env similarity index 100% rename from appstore/ani-rss/2.2.17/envs/default.env rename to appstore/ani-rss/2.3.1/envs/default.env diff --git a/appstore/ani-rss/2.2.17/envs/global.env b/appstore/ani-rss/2.3.1/envs/global.env similarity index 100% rename from appstore/ani-rss/2.2.17/envs/global.env rename to appstore/ani-rss/2.3.1/envs/global.env diff --git a/appstore/ani-rss/2.2.17/scripts/init.sh b/appstore/ani-rss/2.3.1/scripts/init.sh similarity index 100% rename from appstore/ani-rss/2.2.17/scripts/init.sh rename to appstore/ani-rss/2.3.1/scripts/init.sh diff --git a/appstore/ani-rss/2.2.17/scripts/uninstall.sh b/appstore/ani-rss/2.3.1/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/2.2.17/scripts/uninstall.sh rename to appstore/ani-rss/2.3.1/scripts/uninstall.sh diff --git a/appstore/ani-rss/2.2.17/scripts/upgrade.sh b/appstore/ani-rss/2.3.1/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/2.2.17/scripts/upgrade.sh rename to appstore/ani-rss/2.3.1/scripts/upgrade.sh diff --git a/appstore/emby/4.9.2.4/.env b/appstore/emby/4.9.2.5/.env similarity index 100% rename from appstore/emby/4.9.2.4/.env rename to appstore/emby/4.9.2.5/.env diff --git a/appstore/emby/4.9.2.4/data.yml b/appstore/emby/4.9.2.5/data.yml similarity index 100% rename from appstore/emby/4.9.2.4/data.yml rename to appstore/emby/4.9.2.5/data.yml diff --git a/appstore/emby/4.9.2.4/docker-compose.yml b/appstore/emby/4.9.2.5/docker-compose.yml similarity index 96% rename from appstore/emby/4.9.2.4/docker-compose.yml rename to appstore/emby/4.9.2.5/docker-compose.yml index 1e9567477..7731d1807 100644 --- a/appstore/emby/4.9.2.4/docker-compose.yml +++ b/appstore/emby/4.9.2.5/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.9.2.5 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/emby/4.9.2.4/envs/default.env b/appstore/emby/4.9.2.5/envs/default.env similarity index 100% rename from appstore/emby/4.9.2.4/envs/default.env rename to appstore/emby/4.9.2.5/envs/default.env diff --git a/appstore/emby/4.9.2.4/envs/global.env b/appstore/emby/4.9.2.5/envs/global.env similarity index 100% rename from appstore/emby/4.9.2.4/envs/global.env rename to appstore/emby/4.9.2.5/envs/global.env diff --git a/appstore/emby/4.9.2.4/scripts/init.sh b/appstore/emby/4.9.2.5/scripts/init.sh similarity index 100% rename from appstore/emby/4.9.2.4/scripts/init.sh rename to appstore/emby/4.9.2.5/scripts/init.sh diff --git a/appstore/emby/4.9.2.4/scripts/uninstall.sh b/appstore/emby/4.9.2.5/scripts/uninstall.sh similarity index 100% rename from appstore/emby/4.9.2.4/scripts/uninstall.sh rename to appstore/emby/4.9.2.5/scripts/uninstall.sh diff --git a/appstore/emby/4.9.2.4/scripts/upgrade.sh b/appstore/emby/4.9.2.5/scripts/upgrade.sh similarity index 100% rename from appstore/emby/4.9.2.4/scripts/upgrade.sh rename to appstore/emby/4.9.2.5/scripts/upgrade.sh diff --git a/appstore/ghost/6.3.1/.env b/appstore/ghost/6.4.0/.env similarity index 100% rename from appstore/ghost/6.3.1/.env rename to appstore/ghost/6.4.0/.env diff --git a/appstore/ghost/6.3.1/data.yml b/appstore/ghost/6.4.0/data.yml similarity index 100% rename from appstore/ghost/6.3.1/data.yml rename to appstore/ghost/6.4.0/data.yml diff --git a/appstore/ghost/6.3.1/docker-compose.yml b/appstore/ghost/6.4.0/docker-compose.yml similarity index 95% rename from appstore/ghost/6.3.1/docker-compose.yml rename to appstore/ghost/6.4.0/docker-compose.yml index 2e1eb2524..73208561a 100644 --- a/appstore/ghost/6.3.1/docker-compose.yml +++ b/appstore/ghost/6.4.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.3.1 + image: ghost:6.4.0 labels: createdBy: Apps networks: diff --git a/appstore/ghost/6.3.1/envs/default.env b/appstore/ghost/6.4.0/envs/default.env similarity index 100% rename from appstore/ghost/6.3.1/envs/default.env rename to appstore/ghost/6.4.0/envs/default.env diff --git a/appstore/ghost/6.3.1/envs/global.env b/appstore/ghost/6.4.0/envs/global.env similarity index 100% rename from appstore/ghost/6.3.1/envs/global.env rename to appstore/ghost/6.4.0/envs/global.env diff --git a/appstore/ghost/6.3.1/scripts/init.sh b/appstore/ghost/6.4.0/scripts/init.sh similarity index 100% rename from appstore/ghost/6.3.1/scripts/init.sh rename to appstore/ghost/6.4.0/scripts/init.sh diff --git a/appstore/ghost/6.3.1/scripts/uninstall.sh b/appstore/ghost/6.4.0/scripts/uninstall.sh similarity index 100% rename from appstore/ghost/6.3.1/scripts/uninstall.sh rename to appstore/ghost/6.4.0/scripts/uninstall.sh diff --git a/appstore/ghost/6.3.1/scripts/upgrade.sh b/appstore/ghost/6.4.0/scripts/upgrade.sh similarity index 100% rename from appstore/ghost/6.3.1/scripts/upgrade.sh rename to appstore/ghost/6.4.0/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 0206047bb..9c6e13c66 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -8,13 +8,10 @@ services: - ./envs/global.env - .env environment: - - PUID=0 - - PGID=0 - - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.2.17 + image: wushuo894/ani-rss:v1.2.82 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_1_2_82/.env b/dockge/ani-rss_2_3_1/.env similarity index 100% rename from dockge/ani-rss_1_2_82/.env rename to dockge/ani-rss_2_3_1/.env diff --git a/dockge/ani-rss_1_2_82/docker-compose.yml b/dockge/ani-rss_2_3_1/docker-compose.yml similarity index 91% rename from dockge/ani-rss_1_2_82/docker-compose.yml rename to dockge/ani-rss_2_3_1/docker-compose.yml index 9c6e13c66..11a62d9e2 100644 --- a/dockge/ani-rss_1_2_82/docker-compose.yml +++ b/dockge/ani-rss_2_3_1/docker-compose.yml @@ -8,10 +8,13 @@ services: - ./envs/global.env - .env environment: + - PUID=0 + - PGID=0 + - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.82 + image: wushuo894/ani-rss:v2.3.1 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_1_2_82/envs/default.env b/dockge/ani-rss_2_3_1/envs/default.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/default.env rename to dockge/ani-rss_2_3_1/envs/default.env diff --git a/dockge/ani-rss_1_2_82/envs/global.env b/dockge/ani-rss_2_3_1/envs/global.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/global.env rename to dockge/ani-rss_2_3_1/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index 1e9567477..a461e63ac 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.2.4 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_2_5/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_2_5/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_2_5/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_2_5/docker-compose.yml index a461e63ac..7731d1807 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_2_5/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.2.5 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/emby_4_9_2_5/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_2_5/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_2_5/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_2_5/envs/global.env diff --git a/dockge/ghost/docker-compose.yml b/dockge/ghost/docker-compose.yml index 2e1eb2524..73208561a 100644 --- a/dockge/ghost/docker-compose.yml +++ b/dockge/ghost/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.3.1 + image: ghost:6.4.0 labels: createdBy: Apps networks: From 39a5e96e87bfdcb79a239b7b7acd0662fd6239c8 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 18 Oct 2025 17:32:25 +0800 Subject: [PATCH 223/262] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=20?= =?UTF-8?q?MoonTV=20=E8=A1=8D=E7=94=9F=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/README.md | 3 +- README.md | 4 +- apps/helios/README.md | 86 ++++++++++ apps/helios/data.yml | 14 ++ apps/helios/latest/data.yml | 38 +++++ .../latest}/docker-compose.yml | 8 +- .../4.3.0 => helios/latest}/envs/default.env | 0 .../4.3.0 => helios/latest}/envs/global.env | 0 .../4.3.0 => helios/latest}/scripts/init.sh | 0 .../latest}/scripts/uninstall.sh | 0 .../latest}/scripts/upgrade.sh | 0 apps/helios/logo.png | Bin 0 -> 1067718 bytes apps/lunatv/README.md | 61 +++++++ apps/{moontv => lunatv}/data.yml | 4 +- apps/{moontv/4.3.0 => lunatv/latest}/data.yml | 150 ++++++++++++------ .../latest/docker-compose.yml | 0 .../latest/envs/default.env | 0 .../{moontv => lunatv}/latest/envs/global.env | 0 .../{moontv => lunatv}/latest/scripts/init.sh | 0 .../latest/scripts/uninstall.sh | 0 .../latest/scripts/upgrade.sh | 0 apps/{moontv => lunatv}/logo.png | Bin apps/moontv/README.md | 44 ----- apps/moontv/latest/data.yml | 127 --------------- 24 files changed, 311 insertions(+), 228 deletions(-) create mode 100644 apps/helios/README.md create mode 100644 apps/helios/data.yml create mode 100644 apps/helios/latest/data.yml rename apps/{moontv/4.3.0 => helios/latest}/docker-compose.yml (71%) rename apps/{moontv/4.3.0 => helios/latest}/envs/default.env (100%) rename apps/{moontv/4.3.0 => helios/latest}/envs/global.env (100%) rename apps/{moontv/4.3.0 => helios/latest}/scripts/init.sh (100%) rename apps/{moontv/4.3.0 => helios/latest}/scripts/uninstall.sh (100%) rename apps/{moontv/4.3.0 => helios/latest}/scripts/upgrade.sh (100%) create mode 100644 apps/helios/logo.png create mode 100644 apps/lunatv/README.md rename apps/{moontv => lunatv}/data.yml (90%) rename apps/{moontv/4.3.0 => lunatv/latest}/data.yml (62%) rename apps/{moontv => lunatv}/latest/docker-compose.yml (100%) rename apps/{moontv => lunatv}/latest/envs/default.env (100%) rename apps/{moontv => lunatv}/latest/envs/global.env (100%) rename apps/{moontv => lunatv}/latest/scripts/init.sh (100%) rename apps/{moontv => lunatv}/latest/scripts/uninstall.sh (100%) rename apps/{moontv => lunatv}/latest/scripts/upgrade.sh (100%) rename apps/{moontv => lunatv}/logo.png (100%) delete mode 100644 apps/moontv/README.md delete mode 100644 apps/moontv/latest/data.yml diff --git a/.github/README.md b/.github/README.md index 9781fe351..20f4852fa 100644 --- a/.github/README.md +++ b/.github/README.md @@ -115,7 +115,8 @@ | 🟢 | | Media CMS | https://mediacms.io/ | 现代、功能齐全的开源视频和媒体内容管理系统 | | | 🟢 | | MetaTube | https://github.com/metatube-community/ | 为 Jellyfin/Emby/Plex 开发的超级好用的成人元数据刮削插件 | | | 🟢 | | MinIO | https://min.io/ | MinIO 是一种高性能、兼容 S3 的对象存储 | | -| 🟢 | | MoonTV | https://github.com/MoonTechLab/LunaTV/ | 跨平台的影视聚合播放站 | | +| 🟢 | | LunaTV (MoonTV) | https://github.com/MoonTechLab/LunaTV/ | 跨平台的影视聚合播放站 | MoonTV | +| 🟢 | | Helios (MoonTV API) | https://github.com/MoonTechLab/Helios/ | 【API】跨平台的影视聚合播放站 | MoonTV | | 🟢 | | MoviePilot | https://github.com/jxxghp/MoviePilot/ | NAS媒体库自动化管理工具 | | | 🟢 | | MixSpace | https://mx-space.js.org/ | 前后端分离个人空间解决方案 | | | 🟢 | | MySQL | https://www.mysql.com/ | 关系数据库管理系统 | MySQL | diff --git a/README.md b/README.md index 0425b52d4..73341a591 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,6 @@ | 🟢 | | Komga | https://komga.org/ | 漫画、漫画、蓝光光盘、杂志和电子书的媒体服务器 | | | 🟢 | | Kotatsu | https://kotatsu.app/ | 口袋里的漫画 | | | 🟢 | | KSpeeder | https://kspeeder.istoreos.com/ | Docker镜像加速专家 | | -| 🟢 | | Kvrocks | https://kvrocks.apache.org/ | 分布式键值 NoSQL 数据库 | | | 🟢 | | LibreTV | https://libretv.is-an.org/ | 免费在线视频搜索与观看平台 | | | 🟢 | | 问卷星 | https://www.limesurvey.org/ | 在线问卷调查程序 | | | 🟢 | | LinkDing | https://github.com/sissbruecker/linkding/ | 自托管书签管理器 | | @@ -111,7 +110,8 @@ | 🟢 | | Media CMS | https://mediacms.io/ | 现代、功能齐全的开源视频和媒体内容管理系统 | | | 🟢 | | MetaTube | https://github.com/metatube-community/ | 为 Jellyfin/Emby/Plex 开发的超级好用的成人元数据刮削插件 | | | 🟢 | | MinIO | https://min.io/ | MinIO 是一种高性能、兼容 S3 的对象存储 | | -| 🟢 | | MoonTV | https://github.com/MoonTechLab/LunaTV/ | 跨平台的影视聚合播放站 | | +| 🟢 | | LunaTV (MoonTV) | https://github.com/MoonTechLab/LunaTV/ | 跨平台的影视聚合播放站 | MoonTV | +| 🟢 | | Helios (MoonTV API) | https://github.com/MoonTechLab/Helios/ | 【API】跨平台的影视聚合播放站 | MoonTV | | 🟢 | | MoviePilot | https://github.com/jxxghp/MoviePilot/ | NAS媒体库自动化管理工具 | | | 🟢 | | MixSpace | https://mx-space.js.org/ | 前后端分离个人空间解决方案 | | | 🟢 | | MySQL | https://www.mysql.com/ | 关系数据库管理系统 | MySQL | diff --git a/apps/helios/README.md b/apps/helios/README.md new file mode 100644 index 000000000..71f20f7dc --- /dev/null +++ b/apps/helios/README.md @@ -0,0 +1,86 @@ +# LunaTV (MoonTV API) + +🎬 Helios 是 Selene 所需 API 的 golang 实现。设计目标是单容器、单用户、最小化。 + +![MoonTV](https://file.lifebus.top/imgs/moontv_cover.png) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +
+
+ ⚠️ +
+ 温馨提示
+ 请勿在国内宣传该产品 +
+
+
+ +## 公告 + +请不要在 B站、小红书、微信公众号、抖音、今日头条或其他中国大陆社交平台发布视频或文章宣传本项目，不授权任何“科技周刊/月刊”类项目或站点收录本项目。 + +## 简介 + +MoonTV 是一个开箱即用的、跨平台的影视聚合播放器。它基于 Next.js 14 + Tailwind CSS + TypeScript +构建，支持多资源搜索、在线播放、收藏同步、播放记录、本地/云端存储，让你可以随时随地畅享海量免费影视内容。 + +## 特性 + +### 🎬 多源搜索 + +支持多个影视资源站点的搜索 + +### 🔍 实时搜索 + +提供SSE实时搜索功能 + +### ❤️ 收藏管理 + +收藏喜欢的影视作品 + +### 📚 搜索历史 + +记录和管理搜索历史 + +### 🎯 播放记录 + +追踪播放进度和记录 + +### 🔐 用户认证 + +基于用户名密码的安全认证 + +### ⚡ 高性能 + +使用Go语言开发，性能优异 + +### 🗄️ 数据持久化 + +SQLite数据库存储用户数据 + +### 🐳 容器化 + +支持Docker部署 + +## 客户端 + +### 开源地址 + +[Selene](https://github.com/MoonTechLab/Selene) + +[Android TV (OrionTV)](https://github.com/orion-lib/OrionTV) + +### 📱 支持平台 + +Android - 最低支持 Android 5.0 (API 21) + +iOS - 最低支持 iOS 12.0 + +MacOS - 最低支持 macOS 10.14 (Mojave) + +Windows - 仅支持 64位 + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/helios/data.yml b/apps/helios/data.yml new file mode 100644 index 000000000..8fa0f78ba --- /dev/null +++ b/apps/helios/data.yml @@ -0,0 +1,14 @@ +additionalProperties: + key: helios + name: Helios (MoonTV API) + tags: + - WebSite + - Local + shortDescZh: 跨平台的影视聚合播放站 + shortDescEn: Cross-platform video aggregation station + type: website + crossVersionUpdate: true + limit: 0 + website: https://github.com/MoonTechLab/Helios/ + github: https://github.com/MoonTechLab/Helios/ + document: https://github.com/MoonTechLab/Helios/ diff --git a/apps/helios/latest/data.yml b/apps/helios/latest/data.yml new file mode 100644 index 000000000..7aa1f87a8 --- /dev/null +++ b/apps/helios/latest/data.yml @@ -0,0 +1,38 @@ +additionalProperties: + formFields: + - default: "/home/helios" + edit: true + envKey: HELIOS_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: USERNAME + labelZh: 管理员用户名 + labelEn: Admin Username + required: true + type: text + - default: "" + edit: true + envKey: PASSWORD + labelZh: 管理员密码 + labelEn: Admin Password + required: true + type: password + - default: "" + edit: true + envKey: SUBSCRIPTION_URL + labelZh: 订阅地址 + labelEn: Subscription Url + required: true + type: text diff --git a/apps/moontv/4.3.0/docker-compose.yml b/apps/helios/latest/docker-compose.yml similarity index 71% rename from apps/moontv/4.3.0/docker-compose.yml rename to apps/helios/latest/docker-compose.yml index 5f6f13f61..e9f8802ef 100644 --- a/apps/moontv/4.3.0/docker-compose.yml +++ b/apps/helios/latest/docker-compose.yml @@ -3,8 +3,8 @@ networks: external: true services: - moontv: - image: ghcr.io/moontechlab/lunatv:4.3.0 + helios: + image: ghcr.io/moontechlab/helios:latest container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -12,9 +12,11 @@ services: networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:3000 + - ${PANEL_APP_PORT_HTTP}:8080 env_file: - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${HELIOS_ROOT_PATH}/data:/data environment: - TZ=Asia/Shanghai diff --git a/apps/moontv/4.3.0/envs/default.env b/apps/helios/latest/envs/default.env similarity index 100% rename from apps/moontv/4.3.0/envs/default.env rename to apps/helios/latest/envs/default.env diff --git a/apps/moontv/4.3.0/envs/global.env b/apps/helios/latest/envs/global.env similarity index 100% rename from apps/moontv/4.3.0/envs/global.env rename to apps/helios/latest/envs/global.env diff --git a/apps/moontv/4.3.0/scripts/init.sh b/apps/helios/latest/scripts/init.sh similarity index 100% rename from apps/moontv/4.3.0/scripts/init.sh rename to apps/helios/latest/scripts/init.sh diff --git a/apps/moontv/4.3.0/scripts/uninstall.sh b/apps/helios/latest/scripts/uninstall.sh similarity index 100% rename from apps/moontv/4.3.0/scripts/uninstall.sh rename to apps/helios/latest/scripts/uninstall.sh diff --git a/apps/moontv/4.3.0/scripts/upgrade.sh b/apps/helios/latest/scripts/upgrade.sh similarity index 100% rename from apps/moontv/4.3.0/scripts/upgrade.sh rename to apps/helios/latest/scripts/upgrade.sh diff --git a/apps/helios/logo.png b/apps/helios/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f48bb8d0fb31dd6ade55b851f407436421fdd667 GIT binary patch literal 1067718 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

P)9o zc)wdwPMQyy2QkmGospp4;@WWAz0H|J=YZS=z<7JLP zbAh=k=&IimJ_C8oA+dSzPmD^*i%e5aB3hqW*mdD@W)2#b6(XVY@e+$N;Ngpy*q@19 zGunuD2J0ur?yx>iXaqo$trEcm(yb#57qJRZiRT2OckRy3gUKE){y)SAlISxm=}Pg& zNn;!Uh`Uv)Cpvb_O2-#l#9W%7VmJ>Q?&xHP&~O!E&O{EgIC>#{B+Wr&%`utZvo8!o zs){p>_G`FwH02VP``cU#?EiGKE+cs)ZxCW`Db8gy(im3ahJp7DnVjelCeTiL9H`7m zq97wHF#d1P78FHpJBIh02J~F!yd7K+@ zWMtFHI^Ig2L7XoBROr2lBQ0Aix9J$JDmLy)uQ<8-6t*3%);6Fk+(0piYVJj5WE`UE z0bI2;OqA)MV#Uw&(c^KXKEzM)`m4;rLna>@(f=xx&s;jbdgVG+3a9(W_^u56GO*w= zo6M-(proTUHd1pQu9t@PjTNVhN?Pa^HS0P&Fu9|1FkvZjCHz%jrO<$JDOWmWE*HX5 z&5d5hfH=2tYTzVTnC%|swQa!KHg3hnb6nXwzD!DO-D7ljY!aDOU{n!w1?H|0VSmGx- zqT)sMhfQUoF<+=N&hCM=W{(r^NEk!LFqtGV$*s{C>3bQgkUEVF+bi90yw|+VVUW(p zPjQ%Qk6ckR=ltLdWj^KATwT-QvgI(+ul&yG-`ggh3}#5;dPl(9xAtwbA+-7%JQ^d1 zGLHnbKOET2$&tQKy+dSr+pt(vIF3J}%i7O&s?aOc>IXa5h>m`AnBxBi6(kKNqlYRW z-S&EmGw4s_pUyZ~Ht3qUJ1CYd`g8En8tALWKetLlOAEb$Z`X->%5IQ2BKTk z@Q#K$1885{*M)E%u=wnXag{NH_#EE4&2jgnFD_!AhPP*c0dP63h_BVeI>i;X)gS6CCpH!NWw9{$U%RcXL4|cLsGN z3djgzo>TGitAo26WF1T*Y15vkyr69hi8|PHADmP?Smq0qlFT+*eTE$66>s`Pj7Ao^ zF$?G;9=7-#ZWZgIm|(bZEw(gMATL`aS&0Yv9qF+?n5LfsA}@cr4^sKm4T(=M$RKL# zCXi!|W2qimYB)?lQKvT33DFg7KyI8RF&o_?ODnLQM(jSYBr7JOt?B-p@8WUSqatm%s9H?td3_cna zD;F27*p5|DL@3wWjk$!|g_Ib3sH3)2C|eu)O3JFa^G?T)QH3{HL7oU+Xq6GMN+{A;iXFBa*0 zNk_DX66s6vzfB9`0vxYtKLsq5tLy;M>40+R^c2@|2bq-0IaPTlWGJegZQ0TE5^c)W z>^R_1FO>DBBTfRTUu?MqM*%C8<1;VyFaxz40C%JhD2+!H7*L_19Q|b**%TVyrnc_8 zREUVCd50Jn=cV?4JxIr_R42E+eUBtzY

hmT!pn?G+FLWdTRUB*doV_d|By2g9Mlrlrm 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 $+uifKI-u%+y&FCY!;`-VWqk^QfoHD> z`G>W?g+#`^2W^1M(zeG)7T^9nZr3lbY{6+M)#_*2c2X@t(`x`3oJv;*PN&a!#o1u{ltinwSDyngZ=Gf+3dV7TYp=Q#FaE4&V1nR|dmhHY z0l)TexS22v17r{kd>jW+zV7zune%wdJ3oS2XFT(%*I~ULFxSeyK?hqLZ*74r*eh-m z0CtPPx-%PdQt^~#ry*?U!)^q&yTovjJG&k=t~osz?CUZZOEeN&-V%tKvJ%llzU)go z@2%Z_t$k%yu`J%`by%utyze+E*TNP&+5_slLIRS$11kmmCL)(YFTr%6mQIA`b#hro&n$t zv9xr_S#9zXpGGkpZ44&6iu*0z^SxU`M(Q#xGcTbd7WX@IW#)D<7@3mP3%LRke=$At zxUf^tn+-R2d|i=%aQ8$qXQp>$+k4kNm(5U?(AW&vjhbUyD$7a+4$38|orOWCMw42C z#h8}FCa)$~G+}9a>IVu95+~cxMcT~{#KvnM>GJHz0_=!i-eZfmT-Pj7!fAL(jg!vg z10pqk{m&;v9p8rT`gCZy`xy92HVJmkzz4PzfT#M?Y4Oq8JaNTzTn!k?fFi)X4?Kh) z`>EI9Cw}HPapuu85C8|$2IIH}l-rTZiU%Oo%?!whOHUocm%jA5_{V?m&*2L`_XQZ% z`xwC2j}&~RK>T!mQQDDps2u3qC*q80j=w9){z*)qd>7`2KZ&y112zYkAN&M{QzxL8 zJO$&h=Hy!VR2meMniaGGtdEq`YRi<}^xfU`V0!hW7PQ~UZx-P;;B^s;%B|cIgI=)X zMyo^Z2FzS2@V4q4P=i*%uF{swi*1Du{*h$Ol6pXlo`*dc29-w;L=dTfZg6#QX$`0CUCR`Eyub^IVjZ*YcBqRu;)*ztn_kgR-PkW7i*2 zc#1DSwf?pZEizbA6qAZ*ac&D1=Xo-2*oJdvm%v?IITyzcjDZeehuaP zX$(?PwA!}vcPVDAJ@KK~0bUU7ph!Zo4Yh6?Oyd9q#8 zX7H|Pwz!;xdRs8j+IZY`(g>zDs;sqzZo+PYI1L>6+w6-L6~(>~5o!h(TUE{Fx?V(pGH|-QI)?pceJO^kKMPX! zp)=b9_16pDB*^hiCoRP)VJUOUz^NAHZE3A;>4i*YL9z$LA_sG}Wr8IKymzori(oL! z#{xWtMe(3?~nBUYd)o&PuvIDh^CZ+_bc@$i|mc<$4mjLR-LfvOdv-1+7@&@k8Jzr}cW ze;@4oqMn6;mdEMk+Yqf&UQRIjt{m{I1diU37B=?oFu$I3(^zhUXx3pQAmCWRo=k|@ zRm+j=GWnI}yS?oa#L>JMg`GF#^`9Abus%5MlR~^b#-!Ea4UM+Ciza$HexZwQ@))z; zBKhk+pv4A_%&A|J%~DLu*H>S6_4FfQk>+ES;L2nPP&*vOc`1e&OqgtmDd~1%SUQPO z79-_)2~c>&c3vyjVAfIB4ou}uv(DpUMSquatbsOu8#MZ@T>gZSgiRvXV#arSh`P79 zl&=HJ+qXg+WHWzLq9vx&B`qrCwg?|^?kdoLV>u#pXzEHeWvQlCzFVh_kqk?|7hoc` zd-kwwMxl03Oa)Ugrez`~usQ8WiMp^f*OM8+QuaJpZ)wc}gF6La+x7y_16~atpCC)I z3@x|`;5MR`rr1&kLPUm`)ODnuW;A@l<76V66N`Dm5wJtLE^0?QLiO9}N0#H@mSM2O zw|j{nVpDS_kXNJk#o-8+6=wFaD8p~v#|V}yspuVy(Q9RR0mhHT3w)NjgO$o!6Yz;Y zPhc;A6jYu0X)0CJ!wo)u+nxBQKk>`>&p-b=IQQ5&XaVL@u(yA_9iB84pz;$}GOTdz z)tBLKe&d(mRp0$r@SJBo4dZ%^0Rs-FjqNIEPqb#G4C)<|3CYPjZB3!5RWOeG(ETT2 z|E4d--idvP9ze!|diEh4y!{uUcm5%!%^4^rsLt5T?dgHjt18=jr{a7Q z_1vzWw$*;k2Cmz1X-t%s#iGX1w z1NAa_@eYf+nJXZ&!f^a5%qX_CnKs9qwpfuSdc~d+3J?k?;8RvTdq1YT{s_~BN1^qg z^&^RgXp1|f_SccTbimy?bMe!Geb%mw@GXsir?cHRY-M8W5}d6BjT>XcGOMf5q7%1? zkWVI!O5I@d(0w?3_@SuV-~m3FR=)DW+>oNs!EMhrYOCu>t42ophDv81OWzt&WF(RkKp31ugAeX@3pf~crakKg?}-0=Z_b& z!pecM3ix`!{v{}v+yt@5yfW~~FFzZX#v9Ig$U^N>Z;>3+h%Axi42<9U{)59`DRevUJ`D;;jQuDo)hMxs>0$m~6;>>R`Hru89*X&oC5KK#jdDx%rSUTGbi83zzB|bfhq$rr% zUNB(k*xuiYsZotJznc4`xSiNb z9T*p>ouaeltb<)r^mmp$!FET(=$+Cp!183`nM}^?VSf?yb9hgDdl(erxq zpH%;zF3og-{94_DK4O>_?9E=&xkANo%A;&cN#b25)FE?7|R4MMpEU!Xvp zFg<(^hWUV>A#<60g0K8EUEB6x@0=H=7du}A;CJa+ZpFCbq!t&?VxA_x8jy7nzutz7 zyrr-nIG`)uoH7AzlS$9VYa6t6@41@qb6t5o=k$nhB?nRZzb&vR0p%tN^NFQLDQ@3| ziy?sWd=vo+X2^UF<@6`8x%KrZ^F^Kv5aky@i^*%s8tBv{PL*VVT6u=daOzr=OK$*% z6`-(p!&84_i!w}PF|I8QdIYi|JR8N%(P(1}M{Wvinlk#XjHDa-YGPKaT#s>25#lFy zJnVmMdA31f9mwrmTsSA-yLS3V?lV3T(_II(OtpzKMCm+yuRcDT_FLH-I ztUTAhcg#N6%g#NjH^{It`U6+zOTcZ65FRk4b+!zO&1S+MzU{sEo*(&H-13HZ@-V$R zqm+WN6x2xpr27u`T_4`djTV zP-<wV1o*8|so9`;V1fanY<6Utan@BbL4KmJ+Z;dfy^JP*|k zbe=HJbk1#c*FkK6ZW9k5_(ZZT+GO3eDh-Gn%pSOH5<~h~P9`xj4$X8(^owo#Y+Nlh z6~)rGXZf5hM_6Vxe-#5Xx0f_jqNNx@m!EhDo3sGDw@8hS*hH1Qwr%Q}=+3K7y1SF=kox#>d`^K>5b{dYh&8w>-tmRB3h`VKGe z*WK?F>(8r}=;rMS0p^2?n9e>1@e}JTKNra@>_3_H0FP|)JMevDLWHO^z;fq^^6K5}vInLCNvoj+7^ha0~IG7PAynCA|-`kR|JA zN8C0Cp2&`tBpa53^#(gsvlJfUr>dA$@VsZ-h=2D(--2)ab64+YPaC`ItD_k0xJ^{Su6YkucVIJme03UD|bU^?VNK>Lg%brZgzl28BV=~?)E z8_~iaae7U4LAz_8#SQ`w;6%fd^F%tUJI?M%eiLEEnhu(@x=gw!U)~QfZ|0!g=Mocz zEVLO^kBQKMos_yoA8@v6>?+<$Otz8xQ}~!e(YW%kt0k4_{cSYuju`om{yg%fK}SZ7 ztUixv$yo`S{u}~T(@mNq_CgZG#PvQgLxJ3yL!@HS6`zCc+D z>+vC{$80gWrDG4c)p%WQsanu^R#+The&k4KX)UDDZ-k*_F#WUdikMW0#7`I3Iu?uT zZgSjKEFo=&Bu2X1#i+l3?2sE#4lmM{tcM~UGXK$9JX7C!`c@#O@YlPJ#+x_#)T8T` zh%F9Con?bGj$(XXy-$eJHQsG#(&WM!&Z0-Gmz#W7<1P*ET5>DFWi?>O=Yoc?TZ0jo zscUTBPbZqY#mun_NiC_1RU`+%LV8&;q?A12b3PwO@ve)8VI8ZrL&d@oo0C$@%W}-Q z`*{i8iF^5-?1|lEJQBn_sVP*@NQn6e@ve5Vft%ZYt(c~Yp$OLdBMN}C=g#9bzx@V$ z&p-WH{PDX#g1yy>aupu(c6hJ>1Q_=Qto90~sbak@_%mPeIry=E^w;o(FMbh@9Xp9y z6?NkK$i=>QU3?I1Lwx^h^7x?GHvlL%KuX~jew#ZE>ys$gzZk<+Plo7(sx#Jmf^ogV z!JY5J;oE*1^^p%@o)0h#6*8#3YG9f${jmBK7|eW4jbe(VtrHgtpz`&B$Ztu20RE&y zBXi1_aU1=(@o>Ux#gY~`gNBCEkS+~amL19Bwg;9Zi)`F6;xa~$U@|Tlv>8$nds@S~ ztW_}_y8>nJBvI{qa|84V|5dXE|to*Fk_ zIE#z-+zOp$`+@?u`{%s8*!%wAC%2^XP)*{P{=CjB_$7vUf}TIig*x%RL(@8X#J0;r5ECn2xr`8s04qCes&DB%#3H1%O=Mr-6mli>t&w5c zO`8b$;ea6xuQ_9eRAs$wlfRbgu)J^hSp!jSj?74w7F=2;s@TRF_Na~Bm|~Ctph3++lYumi5715(}O^9QR3vBxx6|=*Cxok#T0d-u=e@a*@zwhh==l zt;vF<)~pO&D5p~tBm5yqBqjbDG{4i@E5|6=bI15L=S$Gb*037yov@aD5$7^#ATZkf zoZWfdcM#<)>eCPvCZ9Is2PqL(C_)j@uJ+xIrs}=S7H`!_TaEtIR5K z##|{`wOvU&n9SLBv9%Dqw@Kdg^uzcw%7U&Fquq3JXzuxP!3fOmG+iMbf3j={krukN z@>-^zd@nrRT_o*Pjqw8C`foNO+;%F$j<|wPsZfD30H;r%#V`KG>+mB#{>!-ij(f2# zBQOjY)@x{0e$N;MW#FWKuE14SoWx)Mb6<>a|E90TlW({l!?R)Y}Q>x)}!fP+c@6pu4!7jI%+9FD-djQ3|3Yy%Tin3&x6qHNk6WqTwa>5%;F+MZIL8 z+vq2)5e_}LO|jHKwe%%Tz~<%l#Y?!ITN3>%z@;BFLRRy2KE(Xkoj7~TYcO7T41-Ue ztMb#CMo68gZ8r}&LOFh-yji-nwRr~iZhQ{*pZ-~p@ffPwD+4~D3}v!{I^9{4TCpKh z&X(kkd}fo>WsA${X}}T*{dg^9u=1GK>ZK6^y2GYiF2hfTE#Tl?TsIX^nNX**sE>RY zn-9Di`pCyohRUyV%zQmS1`YtD-#7omzC~NlEdmT9R7c?0)!2LH*I>Bp20+%VZ$aAm zK@Q!D3d7qGc_$WNcHR;XH`)67~B06OFB`HOhlyFP}C2M2i0)33*=lgBaFiaIG&*awS` zll}cGp{9#)k&khy@i~2%UlG%pP>|4HZm*r(o~MOrm=@pZA{Ug}T+%nIsWC@#e8@n& zMw{a<`n^<0K#OIlvv;Ruw~dJfDemM|qSc;iqexFQoVdA3oM( zZyt&=!R6mGB344F^RuN@7xl`{qj;><2`Ep8y${v_Z^x1TM!8WVz^Ke!G%5jv(D7#l5pInlOB6BMv+*6#wz zE6oxk&EpiwRc0gFrj}XmmQ%9mV53v`6Yj_m$uYNUs_k)zGHS@xxb;M>Re4k{_$^UB26Ta_%;9>mu&;15|=wJO3?tkDB?5|hQ0t~~5c{Af+qfiu7QH*x@-;LK? zitqc|UxmN(SH23@Tzw6StT=H2Cm}M@4{*@y&Bs1-fyw`SOo_kej}!L{|x3wKMdWR!8lf^?JDLZ)hE~F z*XaYTd;na~k+vnz2i9J_jBJ0gz1c|!9Wt!k6dl0Y^@?v#Nqpcfme=z|-mboF@B};1 zRdsvSn1b7#m6K7Ty?A75Km|aWEC*KDyV!wPKq&(-9)qke;USTH4Vw9-K-ItQkX{mZ zccrb3=&S%LhCPAQ3%K}+H)1|_KXkqrP>i! zFeg0z6_iv2mVHwL$$s6z)X|{TI90|v6rE8YeSlxXD0axD81Ag?36fMm+!l+c(T=0XVnmZv-<_hmuO(tW<^(boj#3HzsU_{d;^^;k@Exf4Q zPFIcAc7sWNUtEy(`WLayn)0Fy%#VgI<)X$QGs?lknD2fw4)1v{${-kq0;yguCkHH& z#H9FEBU`>Q`&V$cRGk&EXCT?@g=P~D%nAiFw3hY%js{gx{*rIDsWw@$xk+~z{4 zDGzm(-+1$JW4zvxX)UTO9~=kw@y4lGEr{nzL^4;o;n;WraA)LlTeY?Iu*OHq4!`$A zFT~qasLw`>u7Zw+KgCo4Y*%deg4M9X*MH?p@MEw1>v-0)o&u~#)LKzDhitdzt4pJn7F{9IM8~|KU^E>`} zI%yCxPgXdQ5+Q@QUnbB7$WuyFmKE0AiSL5@la0h4|-)He{N49a_;oHJS<2WZVB37)t%ACNC0g?vNf>?s6W@pgim$H~0skDVve%;6t z6QU3~V!S=>0>-BCj?0;0p{Pji>d5^y!+jdMe#!QFv~shY4*u{w>N*V~J4lg6r&*q< zBd7ahzY`*iVmB{{cO5&_-Czh|=u24YCC7<*CKt9b8TbL_WLkwSDlz3@sC8hOtIl^x zY9OYg9TETlolRHX(qCC*M_`8>J7GtuncPuiGQ*ifj<<#pBy!!$!to?I7^DY_Xh&7q zddraU?N6-eWYebmR=&iK6Su)Zs@k2pS;EraI8Eor6P*vo(-dj<;bb+nlOz-Ewbxsa z5g+JF(Dkw;2pEls?;%soX}#T=(_@fO{je{KD}veHzps-5sJQ!q2k|36`OEnC|Mjb#OHm+Q}LtU_m}Xs|JxVhl2ezU@KXZV)R~Ui zpG3sqE>6;F_3xF6bda3ajmzvR)Ap`poq%z@4?TV(#+&{GR;Nxt?IgSPXy51-#o@=9DUACoUTB}VWiuOqfiw- zux11Yc8#`~9YKswW81@?9xKj?hhF|fD>Ah(aSbV@heuUdw=2M~kM+qXKuY233%&>i z@4$U`3JIwX<}|x##ZbVlCQ!@|d<1yt{m{)>2u?Q2?7ILGlTDlralfesOg-QXY=>Ufh+yy;%4pJ-XG;uqz z5>FsDab>s-He60F*2LnJr>X!_`B};fXMj4f{VLkDD&**f=}AdhQ>NRdMnck67f$+U zJ`+2X+v2iX<08pU`$poCO&^J*fI4ZVwjOOZM6DC*<{b2qk6?4_>oMv@KKG~-v?@mM zD<^jR1zAaM-hIB>>jWtLtf3BTj8{AbSo8gVfxRLSnl~ZD!hSY_rZk(92w+o_5Ile} z%_O4euq=~1AT>amTY$F?ieiP@?Jpj?qFu^>$B!2MvL`9ceFffmSJY8EYniy4S5 z$@SOk!p99ZAlF5@ISkOUkD?ZAFeGz^!LMPbk zcE);um?jBomC_bua)za1TxRyIq!c7OeKBmr)18lvs7BWt8-kaXb8Z!4StOmw!0~sp zFXCltgl=acl6W5Qw9+VbV6O=o^SQG~vP2Xi^&PqW_X2hip+gTrckr$aJ#u+m=qq0r zye;~&#)`!TE@k%qqJsrLtp>L!8(%F$^R5O<^<`O-4qLL2ikpP(n$V7hDLlrYZa0SE z^t|jObLJ<;Um1+{R{TONfVev-03bi@292483f+HZ{}yPwNE_PlidVk!m0f}xu`720 z%;%lQRsz$Ez%E&V#H8PLce)khw@1=*SkUzhK9Fxbep$6xhtjC4T97hdY;i}yRyi)d0ezuv*I1{|kRU{Baxrgq>x^%m zB<*;~YpauNY7MI?vDM&iaDH%vUjIMAr^xOi^=9Wces!*!{p4K?p>d4U`9LGY$iZ})i|PvVxDH)de`0fp&x%WUj5ozFda-7?ECDcaLarZ z``)qXqG-jJzT}zs!SDQwc+m@C_HaU&={UlYBg~PDGJu6&t6*Uqxn2FJ-g>`PYhU2 z(+_`ynIaIoRT5-eU(kZH?KoLit=T66mXyK}%99Z_5UU-iP%&M23>V-1``CQ!-Pl_d z05i0DyY(mR?F$#a&BoOVfCGQG|BgrH8H|@)h5gTb8OGz60)?lTlixHB$aR^kH45S= zt$T&7q3?vSH)NXj8wn}SZv#valciZgV$`oTa?WE2KjqxpSLjpuWeU{;%%|_f^pW4d z=FYcZ7-p2Aa`(@q01E0rxdpzRHx(`DznM4)YF$BBm*V&{{uEYMeT6i>>Asq;n&$~a0dBwRlX%ZZ?#4~mUy19VbR~vCFqDyB=O|_)LOukb zJrujQ_SwX4H(m#x-H6zKk4e_y@VoZ!iX&W z|3bTqvBDB$DTcTaS>#g2t^4>%ah{hy(S9=CvdnZoO^!=QTj74DYYNu||68yXpOL-5 zrC}Tm3a^}HHKyAm`AGssQ2FO9DA-vyOsEf<44q*!8Xqi2W3}QvLlCkq*W&%~PZfVu z*+7s9?4rfu8J~2=WhujJUcx5{fwxdq4zyC8Q44uK8-#Q?=%2Eg1~LnbRcjdP>^0ob zusLWfc#M20&VkW=OuoxtoNYmi+m)Jh9MBxXjzkx+15wsR7w?TuoohBsuA=wIOl@>L zkH^8|jb6)}dkn(1{+e$1XI+Pwg9PiP*a23&XSwsVfr#SWAO1N0!4Lfme*L%JUd73PfNGj5;_0)=r}Awxltf;v@<>tn!)8! ziZ*Fi*nq(dq@*Vh3fod{3<#{<3g4quWnNAGPg48OK7`>^6QTSDsVIZiE?r(uW?DYc z_Bk`PKN$u&?i7m+&EVo`CrP2Y26!da&V_GQf7Ps8Ff4JJw%k5gLv^0U_&vogpWcmZ(su)|klE zgNrD-NdrwX>9!PpB?}k2F=o{;S~n8lxnaCGr+GU#OplJ>ZRtqx0VXV?wGES;(dmba z|2$)dZPPSv`tv$e1*8pWL%HV04<%yqyumtTSJ{pPR1xBsm_i%TxQ8s`tevj6}L z>k)u`nP=vC67%K&Z+rXu@xA}-7xDYIybJR@VLCjBodAfhc-YFa@zQ*j$suUIdm;Ds zFLlAb*lXM5i_ESqE7N*3u~$$cS=hc{eILB4{7_x6VfzF=bIrcRddk>|v|t~UUzLmh z!h)<2`T(HSVarR~HN`~5d0*`8H$jd7i66UUy*T+L#|V32*)CTr%XR7h43lA#rQsT6 zRt2ezTSN*|^`=cvifZd+ZaVcC^gEo3mx9HCc)N2WR^kX5%ki^&fp9D=UlyB@+`E$pveWlk-* z-vM9_O+d%Qo+VX;5ewx9M~2(M7P~uujH)d3)`)2LN$8fmGt83Pjlk>6 zDN)E+0rO1GlXW&tJ;{ict9v=$BCZ3EOKt7bgHMIsYs`UsFH$|yF3s6koXw29`{v1iB*iXIrnzi z&9-{89RWbwPHBmx7seIgDBsx=>I~kuTD;?jx0TjOMe)(z^6zdi_4I|4Nefz^5xzrF zWI)wJ)N}XY;P$tmOy?12L8@|_s@kp&a94o)9`W55)!u7oZ36`uh5_@%3n=SjDA#@l z#=T2;D4Qa1#h!pVn?6`@e!Z*ZRLbjyQZApovr5|2@mzoLPORgA#GGbWk>^RI-5%g} z=cqy7J+Rr8THEl?jZFubPT!9UZ+H#x*aH}Zuh~HD>xP`v(nHc&&c}vEgec1@u9Men zHJ;L`O^2=dhJ0cZQtSJw3X06Yd=7f{c5FWQKcEl3AHz^F6kC*0@DMf>U@*Dk%_pNL zJ|UlVJ^Or-8Uj+qs!ie-b_iOMEYy3ib2;25le>&>=vi6kDe8@nJ z<@$0gYad~}O!Ebe$Y46pbx)s~=`_j#DSOnbGqZ%wVC-@f?v{iOeY}rrvJC(X$1WG^ zp8`oW9ir%Co@Q5CIjJcH80P4J>=2w{h-Mt zds_f1F{WAS%3Y(w($%x8NTXm)a>y*QJLd>YbPyw`--0zhj^RFB_u3^&5fWIDb(#q5TK zkWM5jXQ81icf^GW*}bD>&74-ptcP>l z@_w0?cJs~L7*Ex6)h{E zVn97OkNVK97*8GtPF@Wi_ECm)JUw^a(ao73ptFntl+Qel8V-f--H&u5s^+2uq~|(t z7v6@=jv3gkFxzUMlC7;T@Q}$kA6p!^(iZ((ER0xMVB6DvzZJE6pHbTh)zju8>fs~U z-0?>!(`gh@dqT-}#80XDw`y(YgSg$=IT5x1DFu+h4mq4>U~>V(wa)>LU4=62Tbag? zF&4Jv0+>x@El6~hjLcoBx3JKG)emJhojbMk3WBeJDGz(M$W&;kGe1%dbTl_c9yCxoJreZ6l3(*oU=Xlh{y0`m}vqT@Ss=404~If+m_(Xp1u}fenU@ zH4YIer*Dy$l*j8{f^I<(U_Lw#Y#zeqw%6g{!@q@9Ie^H7(Z1#Y)tKn<6cx4)e#(!6 zskIfp!Y&XQP*tEfhV_$QiuIE|53;%>UR4y4So{&V?ilCq!MibK>cq)fN?VC?5DLjQ}GC=B#XWeuyo__O_apxyb_tb^ocyxG_(2-a_m-7;`({VT|%=_N2 zws@HN1RrWiK9-3%Nr`^%L1QqIn`}G5@x^Q$yze9smd94+TRN206$R}mKtM+l5X|Rm zf{0?kNq5`Yg068dbY~Nt03+*ZaaABGnxuVHB7rJ13qF&WUf|=Lg zRRq&KL8@&Dtvo4zu=iItGw__JUX368jz5P#^EH18$4_03aa=wJ2N!WG=fp2jYRDUy|w5ASw+ACs*8 zlP_Wkx!ZKHoN~r)SPh5azTnV$awkBx8;@*Ma`_%1DMFG@K=>3+I@IyhR%ufG2y6^K ztg$+F1!Vsu>dZI=x10OB>S8>@cZ9&6n2PNZQ69OjO52p87*+%7qxWF?#4V^7AA^Di zXYuR-GL|gQm})Xd$dujT=H_jE3fr3TZe_Uth#fC#pDP6HiG_8(l8}wQM@OtHJ+mAM zR-WCf^4#`PD(1)Tha8-Ps&X4JY}H}*{*aZ%ro=ceD$~zn0>0+P`=J0hynyNa8ECar z$Cb6zPY#TJ+*o6x!dh{m*L-7;`k3N+^fd2liP&bj!hEghehd*{xKXx0@lSH2q}Nj5 zhz{msv4QA0;LPoqZugs(#RE(*7AFD?wnCXdEg#Qyww}Wk4ix4R4 zJX1GCpgQw&yAVix(o<2V4P+=dd14QL`U{_jpZK9~#*1J4B3zgUlwm{>V7)hD90neO zI?s?gV?8Q9dH(}=`9J?9{LHWXKF*y#k5VR#g$E9D=Za4T-G>_g%bhiX?fywj8W*S` z1|H?l_Z}u*l*aq!&ktPTt(GG;`-U&O~i(43676CgPgs~;bPw7d=r=aK6($1m}aY%KGg zqNoeYWDO!!z0u1NE!-6aZ?L9Emo0=z(s){o7xHK!>&1{gtEKrk!*QY*4@h5L;B|7P zbT2yBZ}Bmm4gNwmtdMkzk=%Co&+rzkGzQgGd#kT#6 z4EX#PJ`F$eJ%1T5{esWKF!D(&Piq$p!x-=C^2A}5Rn-oAlV+p}I(&g|eWy*UwD+#7 z*GqiXm>Ky_v(-6}o{DmSHEk+T){v9eV|en*fc-tbJE{JDAs|vQ4l~MFFg0&Sl^eIFlnW6=o?LOn1ElICBT)%{l6}6VGdF5e}i74)R~-g>BvH#Qb3f zL4MD|K9i@RC`W2F|_lZsV1*=!OC$k;vhs838#dA$WQK$3JbNA!$w%0=+`7nl2 zfjYAdn!{FqmC5x5o@0ShY>TuBtXwz?HOPSB#1l|XTo06W_>|cG?BWY;P79T$Xu9-Y zwRg!0_G(B1f2W(0Eqqd3U7t;^HpFb9TqT~n|8+dd9;}4ic5hLv3)#`&til!`tQr=# z?c%mLY>;Rz$vVB1(0mZX;&qsuSXG7A_WF@3&oiNqP$*{1welQ^Sy8LnqGo}Vf@j|F z1pL6aeI35?D_@4PK7}%@P-iaghzUBB0d+G$rwtx@@L~M$Prera;TL`vXU?6&JRM-J zm4DMrty8I1=hTMVc=dK8CTnU!&11C2==SB;-M~Dao8`4!M6puRAg3+-5Zf#}(qk&^ zm2Gw1YAEy5+8OOGG2_0x*aJ3a&}qiKgX6UN?q)fmFyqV66-mCP)YjS>I^Yi<7CiQC z#XCqNt8EPH)yTxfH3X#925jL)z#VZHyS$>O)*z8#Jsgo_z86R=x-1@Tx=_RS3esFf zCc9m_IJk{u=G|x{h&I?I(2_54-;~n*3mR6?78x(kX?eM^u+0Rrw9K7!s8+s(x7}gN zYl*SY&B&IH;3>GWOr2yv&X)6A$JsNN5*t#>nA6?AH@mhZB6SYKlVBCmbdVA~pE;9- ztaRX69!-BOw()C!#-qRrZ~o8*51z&87_u-f`Gq9^0<6p!d{`XG_)dWB?0z4`kx45v zHBfcrH1UNyw1i{PaM>1i4lJKAdcmoIBm)kvGybQ9B;`VB;z~)d)JfAuO3X-teqgc1 z+rm*Uz{K6owzx!o;@{=cIU zUJSYV*??Be6F+4(4&c^Do%sZLJ!13V?KpVbFF@{l3l7iTgMtl)0`R$w@op9EiwIU6 z+m;^!73?yk%DmjcVX+~GPrR7XP%T|z3Z>qmSjOh_?XzN5Xtjj{=J9Cf$RNsYZAYli z1iSL=@W5)!$hLikj(E--0HBl=WOWkd)Dr<2Tm75j=uQ<{{2(?P37PKW6J=@($qLj% zZY3B7!Su)-*xd0Z)Qb-TnEAxo7^0e70;g&9;k;Yru)afVKz&=PMcTv2%zH=I$C%z6 zvy3Fypo>U@(_B^Qj;b)H8+=z_I>dC(ZP0@Qs804_05Zw2Db82dybzm+!}^J6cVak+ zZx%HH2j^li=IGYUjWXLvqnuXt+%OAkgt^*8(5is#*zltaSbuBfIJ9z;D%BV?IlYQn zUl^6v2J`mki&Fsj-h(Ypsq#aU+|4-y^9AT5AH#)@z7DcE3snN!BIJU_YMxR* zs&*!TGi=+kMKD)E)q>&jC!<_)El@^Nn=O=q{F1WRE);H)5z}StUV_Ww`Viu|K284& z`*K{Ya+uni##vGnZhAB+)MLVs0#D(3k0{bNJ$pLP*m1n*p51nWZ;!V-F=UDul0m%9 z_NBwpdf$hJV?_iVU1YZesn#CNzx#p`>&g15fjgF-gdS@GE%a%o(g! zWW4&~17O>sn+>T}V5T^+IOwt|J0-W%CZ$0jxA?qwhSe1w#^Q4$W_xJ)SVx{e9s&d{ zOLc^>?MSqagq&tpMTl2*T?x5O&=*a6PHZj4iplu;bg+_2hV- z45UI8$(gjM08i>NGos6t#G@VLRNA%xvF*Pj1v>ykJuli=2k81GWkgD|JQ}GTouif8 z1{QcAk^tTMVGvrD(A9jJ{)+qcK;CYCG4pV&3e?g@=dm+q12-VCj+UN68LT)R(L zmKNNGK&8?0ywMVkNCr<^vK{Hmhy_F$EkZg*6YPpxlx5r;Q8n9+M)D4iluWg=9<4S_ zPfTa$7ToS+>j8{W7*k-pZG32yiAG!24&c3F9}k@V;{ z9f20n##M`Y@A5d|_TFbtuN^Go?@X&IiU^9Cv(}2LJQ;W>f^!!y;3xmv|HO~|yI;YX z$If6}4Y+Xr(AEb9(^OHbV!c0NwO(N?g0K0q7vUBE;4k9oH{T4Akx$(#_%3X*75b_u zWgw5%EUA8b=h6FT?{s}&;CeIp+}2_c;xdYlQC$JNiqp391Vjoyod-oNYe+rBbpN|i z=83wl$`iI{KAjuKf+_>%a}Pt#--mMQO4RkGJXo%bs65j!?9i>Ax12EgXYUwr-qaQ- z5DOF87K4UMZSB$PI4n<@mggl-hRvZRc(M^_5KSdVCdhRC;GqsEGi+?srR(AeF3_(v z3x7lubw0%O@JF$^|D71-4ZrZGg(v?HMqByL3;Xo8eH7LPoG4>RS5cvJh0YUJ*F7I~ zxCFzv=DXCjogEM$2%W;})~iQMK5JI(Cdr*&#RqIGRctcmm6R_|J7>3I;WfWZ!?OGXj)8b z)q0I%>lHrhxi{ia1t0kMy_hx=UnwZSYBiYs*z%|d4h|0Ro{!#*^M@Ne=jQ8iVt=1D zPz0EH;417PfxylOnFKOWq1=~6M;~q2#PI-S=bc(zGnx9x>hp1C7YDR{&1ke8Q4l(~WXW?N|Uy0OHFbF!Y~{dRU$EuW_+5ZXl?%9(jGSh~KzS;RHn zZI_W_x*}3LaIBWTptDsdq1Bh`*K~uFWl1VvH_cFL%C{w#ll6+s$rg55wshzc8k2Ts zbhgWJ@?i!^Z{77%K=?Js_ckLw;Po`;+;7RF1dT{YVS^?AKJJW)$hvB{%WCp2eg{~5 zW>hTNRv3binq62Hb(t-1=rNTn@QDg`7)KJ=^H^qo$FlL~@g9>rzvmAcc7+XG?atR3 zjVlwzoOzVj1MwGWYCnlZmr+bd4KIPGNsqqb+)iW~6yOKILSRd!&?ci$E(+kau7#xoaNZU58sq zPc!FB0~snUd}XkmlOq@ZY)rMFv7k$9&`BW`s8ul?@Cp5TwZ=FI z?)&5e__sg%>-fo^{Y@NPIFEvg&1S-CHKL3KRRkNIG4AtS`t{y`zw&i2!OOqn8}Q^C zt`FwsIssZS3*_#r-z0kG!S-kVhgKe?0?8aoPN zutMcj6|D9z!Fc`WL!S67%uvjeK#O2p6`nIN*q04Po)K_(_xmxu^XDNCy$AD!2LV(J z9Ah=o2^2iY4uiAri-<&2sX(!p*q4xqvQ_1rCWYAKx@+Hl@-!m^woO`En?@S2c*(r7 zlr3(&d0Rr*zFkR+dJf;_;Widb%v;^2f)s)>tTCLp3bm}E1C=JF^-R&WtJ;BD%;#Ru zNs@=!o*Na#I4Y(GK8(XV-;6q+CA+34AxoVWfcCC*h-4FcmbvIuJ%1k1TAW$|D)zM3 zbEWbFJwsk|PVNl5a1B_`)g~1HWQJUL4D%zOw0f%0d1hL%#kOKwshb*Y7mQV6N^}3k z?CBkA0Z=RI+0%St=nKe_-fIVGkd((S27WG>p9i3@_mnN(ker6yGK<(xZcjamf zy}6-EtH&s=*i#v}eP>==cU&|qA`l#+)YI79{~lbp^)1+20a7ZUTq$%rBMF6SdlO&a z3p4K5Sww{`>HwHkAj2uFue=#$?LFhBA!uyo_KtuuGhR#&R$g%AiZq>s$u@r+ z?TrS_LknF$PScRp4l-=j>kZEQOf2lCJb*o2Hvbv=Hn4`{{b^)1x-myxmKFI!+#VKj zU7ift1|;_}Ok+ONU$OH`D)lI^?fj^G;4j)1y?{)#FBo1X1rEb*pK7n@+_X% zzV-R20uUL3r6uoiPXWZ@oT4~CozOXTyYyvqT#C~N8qm3CefYJN5W2MM(m^i~BIkn1 z7%VK}fh_cb&4~Bd#8-qoqOZ7I48!aK$-*`h+c5^#c*TRZ5-tD-(aO|1SCk?stHQ~4 z;p#p=e>dTw(~sd_|IBaTpa1x)aqi4%$ROC%8N*m0g94>ubMYKjBi|jq^yEJN&R_a6 zeD}9~J)UsY6QNpA=Za~XZScT*6~Ss;+lj_NwS$eEFKVSZ{%sp!4CUdis1IHZn%AX+ zjYFXbPC>vYEyG}1mH~R~T8vNqV(9ufGnWDgUk9jj#k`p@jDpo3P{x9TyFY;Go&O!v z1MkDZ+55=7@+>uHDbbn-Y3AUVm5MZ1- z(otY(J;h}$B?3vT7!YL0StGz3l>u_{2^jWHF{#4$r*rho*ZgB)SCj+k8vXi0DU!Cg z3n29(raRsOxo|%=7arpv%nlEXaZ|Lu7%_(a8rWdX>Y-IkKd6h&-jpIi%(P}SRihb) zo)w^csk8Wh82j^h%aWr!6#XLC+WS;>^*pP)H8nzLKoSU$1V~`aWNd6>KLj40ji3E~ z*ViL99_|nBwGm*0FXkCvT^mpMf|-PnkPrf70g^y~5E7aPP@`7Q^H9}Y!#QW~wKCox zUqoc&+Phjr)!A$16d4g289C=t|5?FE*cf2g-$qP;Bt8wQ~0r z#LB@2?S)4o)M*p66(6?~6NB^3weDDM-UuWL)_Jj@{ zA2uQCUdzZCkJISxEWl-Y;k$zMc(4f|)_1O|m(_?`XKXgdn6?*yqkD1u&^vJM_MgFY z^Z;~yCFVL~jscE9v_Q4+qQ4>-#uZMi*7%!${+0Nb|KzXYx*KoARC&)%)ry0I1N-bG z4d}exVBT)N<<`p1gLP zVc@gu=tp~$Gh$-W(vQhnT6C8*_IbfaSBA()jx3y!{UG)e(VLhWWEmx~bZiJioDHOB zj^nn|3V4xE<76jOYomD#(lohhlPOwO+{cie`zhK1|ami;P z1W6w1=OR6EqnRu%sj&Lj*-&kNi>5ZBB(@!5^BYk$#c4508@8JMODXvMf1F^qz{?tcJ3^k3eD|L65@=Q-Y@n03a9lLrt{Oq+_$ z@do3H1Bc5`7W|{X{?+(<-}V=9#PTP+_<_lK+^`-n) zwE&1!W-CXbpd(AMGps^`#Q`j3ugX<>-aj#O7r;Y*fbIPsgz9%ND~UB^rkjUOww&?yG< zT`VkjxGcWMiwf&96aFma(>cfpK=ztW*?VvQY{m@COHB?^>@FI!Np)5z3TmC8bqmo$ zl*8Mwz5gvZ`{_5}@bSBG;+mIXIC-so0fqV1xkkSew!^Ms#=(gbSPvuq^4Gr%-~Ye= z4P1ZA)3L21iWF?;3FB%&DL|bnv{npKQMbo<-J5?4|MK6z9``)-FxCeHzy1lkpT}01 zeK(Jqt@S$rybN0XLn))h-XddxiF0 zfLshUuNG$yWM9wH^YOoZVA%j9zYnmNC?Dfzmjd&QE={6fU+2R3vDbvJr8LUyD3j5j znOK&C^Y9eB0v?#!itHUe^ko*wPG!tuHa`$}SbRUU=PrvOn9ulf)+zErg(5_jjA}Gz zJ4}X`M{s%V!RAqdw@hR(ll)@Z!5XCWT*8i@C(W65uqW^2y^QV9pZLpQHiB}@&{C32jz`7QI zb73--l%8^J9xX+L+S5Y1iqOJE&3LC2S(sgUBq8iAr$mq1kJA-AiCD)wVzuPKM3-;@ zO#)T~eUNvi_8CKi#yz(Mvf)N5QS6QUp4)9103*6-ZfOb?O$ZKIf~TCokn) z0plvlK_RFUCo!Zb%33k3fy3K>8%OW^3Cxdu3U%`sfEj4_V;Mb*^73zW8*L0t4H3jv z(pt(6gWFwoDVe0qze}@d9EzX8RYw$E?gT04j)y*8_G$EGN-eRZQr@S#-1`c^Y>$i> z)>mM-)=?K!s|K^TeF*r_!fBLW@oBm*q+05&wHT9k7M4Rk55GQ70=(7 z@}b^VY8J=M{MQBPG21{+1|!Dr)wpnu+m++{_DQCmNPQ8&4 z$mT4Dp`gw)>eg@nr}jXtvnA}{@@NZJi9KJIFLf3IR1r*7P~`yS@@GL-m$ox0_E8nU z_%(c-w`kj+DH{v3hu0U06?HYb7}Kp$QInJnoLDY3T^z}9bs7u`_)U5bP(j#1Mhj+* zAfq|J2#h|M{U{5k>m%hRSd3ny3+~St0WPW*o)KDf|8q!Dy8Lb6$G@g@tea|gY!sAI zpi(f;TTGiH%$p}MJo)=LzT?NSdE_@C(-|CG^Timi`eGC*C{i%4xr^XsjCG(0Y>IrEVSQNgr+;R2pR`bayc)g9C+MBz+;(W`>{b% z!$`Tfd~#4=pN4fLK$;M0G{S7S1EVCKtPTVO-N7**UV$vGQ`S~_vp?U6-_u2aNsMvm zY;8!!L#smwTxc}pS5Zc4a_uq%I@LDGq7YDO>< zdXU*L3svqo&FpvRQk#_J7p+7>t_+2CPJio&X|QxJ{ahAkB&nS>M5V5(R?IUi*f6dzt_Iw7-$VHR|L}A8 z**Cot>p?ISUP3gE1Ih^0T2bpU*6RVA8Mx(!tMNVm_*?MmZ~8i{PFw;gQ0t7TP7q~B zMQg>Z6~j21u34SY(rtz6#K>Nu4XqL*OHgGzOYEI#$|7O3`WqWwmDqta!77R}te~<2 z$|YFc@Ff^;{5;H6F;5Du+*+&K8D%IKWWYRCD7O({9A<3q_zldTd;|2!yP)+j#yl(< z<2{4018qHRgLbJNr%B9WI8PQ&LuaUilDa~!d&|yncqm$jL~JF|n*u}929H$uW(pG0 zM9ad9<)ZFk4L9t4A2{JDco+(>z69mqDy}pEtpOL1=8_iJyi=H0{iU``*@Tl}I&%V~ z3wI+z~tRqEdV0#Qa_5frY`tEDxZU#|aL>YOAT?PnHH{&h=qZjQx2A0ZQ7E%QD z@H}+8;p(jurAiHQwnLFtbTP2E z`WIP}`U zBcv2N5+W$WfT0ZhB2VGh0x(s4!z-SLAAZf>#OFNkIjE}xtPWO?L9kx0pmoN4e2mpt zuqqRD-r!Ad`#pTuzk5ACedoOxR{}rwPn*HIO|`N+ZA>U3e;153xjsns(upE92$?xp zp=Z4k5o^O;j!pXBx5)bIN)*wg*%$HfR&2~)nYVQM*1@9F93^yydh)wG8wUY@tIgK8Q6y?rA#Vk)uq^OOPgTjhQ`Ub?rzF-y1iTi8xNv2U`em%J`D< zcZi99{`Pmx_fGLuD zM^J{#vTr2XOU^#tJk72!chE0g>9vX4Th<)MFy+QD2k(OgIZNtPcKM+#&|Ul<*Swdw z_QImx_vU3mbr@@VH~#YlMM>r82Aa|CcxfF2hRSY!2}c-`=3{Z(&z{klG%qe)arf z)URRw!#864#GRO?^AvscxlEQVtxzgwEBuA8n+zxyc_<(2OC;_>NJ;(pbo3E5Niane z@yS-R^V)Qo(R>El(xpNPT46fh5s(HV5o-@PUi7#DLB)vi((Abkqk!9{VZu>9rTB3M zJF{+_kQYO!Y}g9KwsZ?86SP8)Pov)ZeqeeMsvC=L`B;a;yMb9Y%)8ZJRomw0e~u!t z6%r7Ww()M_iUbleX`Wd$(@$D0 z1)t)Kr$q3tFVKHJJPX|(*#LkM#mmlTw2L2eDXf>#pr!tvMa>{cd3$^qP4NstHbma< zN?u*KLnI@fxO7t4e)?Ja5QY?J5$HT&K01x*(NE&=)9=JEOeibfuTm%Q>^IuBcHf@t zI$LV)C-AH0YJ+|OkH%jK~x)gQIdxiOQh`pQTPr@wYJXH!VREN zP+!9{yQ(@{OJ1zj0IHBO@EBeZOw$JQ zbclL*KlH)3V7}*PFbZzT|mN$G`oqzlJY<*%tugNfZpIYWk&s)|pmiyM@eK{LkO~Ain#xKZj4>c{jGx z2HR*i8cxe(AMF1!_$W{0eGCRiQz-7o|zD7TL;b})*TW3f} ztM9ZiejLvd5~=Dx9c}I=%^oLJ zq|*HDN8Q8{TIa)QY566pgtOD`7ji_3ri>TGpA<;_$6qqTlBjo3BgmgSV1Avo;ERxm z#w`qoWJ4W4sh~Z6Fk;>dW%2EJ0nK5M;F< zlgA>GLG#Wsa6~P`B}pELQwAGS*|eWFXzwAl<@^9B-g9@fE*hrw>H4LtvlTGuz} zcz65lEbq|Z+Li+sG?|k+YvEDL9dSydB*2QkyGw%zWk8%DZZ^L}sTTsv51HrL>{mkm8 z+bi?y__Br|1^~u`Z#@`fi#-ocO;oa#|>;ntzE~F9Ln(PX!rfVK$(RYEg zvV!4i?PHelf|w?N1_CGqWmsXj{CZU39StgMmbem4qo=NOMym5)!3iNnJ2IeZ_d2Q_ zjTr^QYR1t$zmM&se}K9@-|u`{R_w%ki({e*i)52mA(W=es^lwl0o*d)a1xqGx(owI zmEn$ZNO2ZrqdEhaF+cGz?0B$9U_ zi102DP|u*8Kw@+jsw%&tqE#^pfO-U6cnI4&e;au6{`SegBD`>MHce557Va?c@1aXg z-&X{87sV=SF+v5XQcz`u@tS9&oV*e!qcPG3AMG+slWo^#L_o-kgCeHzRk7SUWijSX zy6ZD9-)gJ;)dv1**^>!|TdfT{%(7+%P5T-xu6rhU0J$kN8jU^iunf++cb?P}(BH|+ z@tY|$iC!dLFUz(g4aT=dLq?l3SDu}pQBms#f+LjU+aVAB9O}Klh&9*szRm-Z+qtl@xT3>pTMW@xCiSKqfL_gJs7sr$Lla`^3LwWUUsq$ zNbf^c^UccOI%O%CZ97I3I^j53VN#j}IGcdwWkLpQY>_K>7L>__o+(NbBr*E&J1!$U@)eV&^W`m;FkBt2c!CzZmrui)oj~^Mnaz}TbOwPI5_tRcUHm?%xwC$z zG!#=xl+*7C>v#$J!m;NGAT`>}W-Sbs`F8pJaY1~$+dd#Zw+*?z2I)IV>yogi2Jig@ z9=?eE_~0KZ81i29q8!*)1$4%vr%&VG{?|9-r{4JMz%)TbalEORCO|P@uKeWCsY@@z zI3D1|&wCcW|2zH?UiFHX;9z|Titt=3R3N3G41;wW1*Pztc&c2bV8_A-Ntp!-CAd$r ziT1sDH8A!aqi=6=5ajKi3H(f=tGCiml%Fc+S;rA_$uqEe)>lAJU4aR9>0Gf-CQfr4 z`x#_l8JCJ-RZyn$*nI4lp?CZ$wx{pJJn<8XYM0jo&SN8%Z>Fr)G4Rf@hel_|whktV zbt>$#U2?u7!-krVY`>HOQlvIOQeilM4>+|(; zFwF~{vUqXHqKjR4Yc_yVY#?&@FzSOJ#C+jVpz?w|Vn_{AZkQas5^>~U?F-P)0lTg- zS}PpE9_3!T;e`8etd*_iK5Paf1=ePBmvF`A{?9dOjZZIr=U0@r z$hQ21w3R=62)BHnxE!l%p9zsQQ0*><(sa|yf_0|R533^)OWl9BJ@NRizoftiK`mZa zHEiIIy#8yu9I{yB-MzeCWPx}jt4m?))no-DJIA#;pIO|2eSS#(WOm_a^)KX=gBiK? z=`76pimJS9Pl})n!Y^a!F?4$ddgcSbJwJ)*fnUd5p9EF~MJvWDo`>}fUke#8$1tu? zhP8dQ!|IC+J)u@sVs=u%uh+pmB{4e3FzvfF(PF%`kZgoN# z2Mof?fmf>ms1xdTi+B9)C-5&{`v&~MAAJV8oiNWcpo)3RX+s736rMLP1*BA(#cIG6 zT9yy>qm?6H?QVgK6qEQaA)jo4#3aAk#MiQn6urVxe-;^}@a*T_teVtO@fF(z-mZZX ziFT;96U;M`EEzPKnzuU=-UXc|vSyJLZv6XL<`*IR_%$FK$sWXjJ>_padA9v~$3)9& zNmhX4bwtgZPn%V80lHk2#Il}w-2II8SyKlER;CdlYiz<3`9|(3w9z6k-ZM@s8_kJ* z=Zj7L@6Z-LY!8ybPH|JJ{VX@RW)_2ltcc#$v@$O~2hgl*ZY-o%GDW|?YC%x1k123T z_)epqD8ER-2BhF7R`;~0=7uOYiYZPs=MMHJ9w*UMY-^xjU?p~7GA=&pp=IU9fq!w~ z51I@NW6w?BzR-W^5h=1jG7tXB@Gf}@Z!+5r)9lV^oIdjl+gze>e+yR~YjY~sy+sM@wy6Q7rL9!mJ603CZo z>|x4|rZ=omwC#e9+ZWHg!{Oy$+QmSTb0NJ7ei1;+3gyJrSl|4m7_NN|=2|h^u?q3Y z4JkmWkTpBss1-6)3K$QoaGeZJR$3uOfepArkXAMzJ|^iAyQ{0eg5Vf@ z1t3rvffHAut}cUmnrKYSZrbDxOuwof?{J<)8)lUz=OTi6TTyGppc`!N{(b2A`=Il2 ziIUXto3G98M_F5$Ib90do#$zqU>fb_keEWOyB0s2Gj9* zOb^|KLF~4)qLA5loTNN_K$}Ud>>ZqGrF z9s*AP7WA(F2h*ePh0GU-e%?S1uED`Gz7gxIp9fi=0Ay`+31k@3wqKW1lb2VFd9K`z zQ>{HO6~)@=mptbt{J=l^R=n)xFM*bm7}sl*fyaS#R!rLoh0|OR1>XMd597Oj=yka5 z?t8F4!HXPy#|FS11cYjL0>BC*jR_>l)9gsIU43I8MG<;o{Dxo|S-~05&<(XR@FN$( z9X)P#SY*E2gg7LNQO(2ik=D15zQ$6O8mh*|atE+5pr!LhvxS9!X4AngWc9j`D}YPF z>o%QfAZ2uGtUeedc>_zPESbrMA~6PXI)4wl-soXP>{;ClA?x_*A(a*2MD@C0KH>iC z(Bh=-M1CyfVT_m@f@C#YgGCuSQYXy&Y&jDzMnzAvEaG)`tl978*?d|&qVYP=!i@)! z-q2fY#^GC-c+#(H&H3wo-!irsr*YKm4C8_ z)=0PX$DYiU^4tl}6+vMJKN#A@omT#KXlDfT+|6r=szc&&a`J>i_Zhs1oFJzOXRj9# z2*a@x);fuSu-E`d3x?6Y$6V~QHrt9?Cp>)mar~SA^b7d0pZPUxk9p?5+Sxc6*dg5< zA7M2PDC3AP`=aOKUwy}4#!FxNLY%zxQmn=`<}GgrE@j}B#(9Pauv+tTRJGdRKetz| zA5QWf@ZAeLc76eIE;P!39VA#fmI2R0`YS|Phizq(aeD*nwy_Lr=%vrZ!Lwe4a^f;f z+X~nU-r%269C+T4M<5F3?To4u#&v<5dkFK#egXBKcjNf^!CMl8YCxt@TkK*h!Lf?L%Mx$aC1*B>GNInQ;W>h7Qsw6nF+Up<@#<;xr}bU4%xO zy@{2VzqlU&)dD%V3gwb3BTeh*c>Om@y?liTTz{xeNsu-Gp)D7TBg5ne9N{)SJ*_8n^HA*ieM-rhbAk7G_f3|v8*GC7(B9E6vM#d zDM$C*4%iBwb0dbJcs=#Xs%V2#wfd$NvmFi0gw|Iu6PD;@_N%T zjjuRp*98f}jZJDk-PD0@<-N91nd?W0NWIV4GzUIa!(PP6a2c$WwcexJUt*{Y-_%h!js359Y<9wm{LY-Xb{zBhDXb$4S)lT*M2$5=8ZF$JY5#5{k;URx@5uK)17X|1MFS=J^DmeFP-Ozt}Sb zxd?=a^K+TP?GqOCFPu)!Ziqw1tGjWsKs(;uBfVR4H9c&~n4{-@L6a3#fG-N#C~5-r zB68};>t(Vd)2#L|fvJ)Zyivaxq)e9i3I5mvaI521!NReO z7Qm22ceO`QuoODFWoz|F+X*p+$#l#6a+vwTyaQLdi-Fa#TF|f?~Deg zMq`R;o=FFTxoiOU3NQsFx*SdKwP3cT-77Zth|WuHfEJO(c=z`du3$fVsxx%1SdVL< z0QcPg5PtAKzX`AZ#oxqOfMK8v)(0bov0&az*c@^2F9Lk&i=T~u^&Q`e7k&QoFs@Fb z$bf0f-308wGut{-Z|Au}wW3Jdg0FBIDVQ)W3;8J!E8LlFht6ho!s4rogB=N%iFX8x zolED%M?P9+Ior2_!T6$F)gKS8!1|U~Vz}{ns73g>Cgp9*qTn~YD?7VB-!YB?DHF;H z*gkqE4&VQJ=))gCJ$ej~4F((BJ5c)mmKuOcd3ybgIIftk=jz|1H#QBobVl5H#>xtu69P6G=LOh&P|8RN>_s~8uFpg`;>N3c|HFoitPksbrapv6f zcD>h}J4$&dWZIyff70$C*k|y1X2}md+O|%6E{=OFp%0NRPEwcV=V?69PfyOC71zb~hA2F+p*JQlCIMybbd38&U81dEodyltBT^{0!eLC|AA^ z`j zzWp!am9P2|OtMBPf>M;9>qW&p&5!~NqQJbxuf6Mo_|6}C9X@l<{a7E^<)PIkXOwxg zodNc=Nh2>#(;gexlHfLIq((8K;|WEucW?XbpC1iN`rS&Bm&8&>-HUj{^ckj~VmUC> zG(v1(EbeIZ`#bHPdm0}u1Mx*aquW_?aRptLvt7!_2$m`?YHZVbZ7ktnlkg1e@(NPy zJ#1l=lSOC7{L?lU0dUfD2P{AF>aQ@G7&q4jSpF&Lu3yf=19F6pUxG`Pf8IB-pBV2s zEZqseBDDj}KfMA-{Wc4r{-uZ^Y~qTvi4UrS3(tdDUYs~vfO;cr&Mq+NUKg;$k^(Jm zE7E0LLhCyUEJZjHEVjBNpe#%g6SE970$2;fZ}AduVGH1ut9g*lrC1hpT3$=)9U>op zI!!KkX%#9WIe%)NZV1F08)h0wcF!X-Tm)^n>o_SKQx=4Rv^de--VY+N$P!fSMD7^b z4PN;5#}rz}t;f>Dk;6LIQViw}It>`x^kb4_b?CGxXOvb`jhBL0%QrRfwDmo2^6oJ+XtrH$Qa|Zvv zAN>XV*w4HjvfThWV|zStg{sb|#~T!#apL3w#)AXA>PtQk-}@bZ2`_x!tr%Bp2o!Uj zQO1GaA@)xk71*%>ldttAt>4_h+(}%q&@;DV`q1k! z-Sb{-pLh^eH&7@qg91CN0@x?mGGm1ovMqG0vlSi|^`Vy+vZzwBCRum2`q5<3;(L8z zAFq$oBuZDjCfq$$3tQT?{Ddg?GD2jH)#W#skJSaWl2YIHpq$l4+W|nZ#?xi&^iuf7qXYz<;>|-bKTl&cdIxX^^*%`TrWH49 zT<`@Kua^Z|dYw1eKK2miGmoJF7+_mx&5n4zg|M?1lc!z>oi)!00%(cT@3tStY!kx= zFs&S(vjIqA&~ccDcRs~=OOgx$c{xO=z3=Iqa<>9fh7D3m^5%7JX|LVW;;40+1l*1b z+w})j%-aj7hYw?W=WjsH-2;pjirEJJLOoOe>>o$dQsO$#*1mU>gMQ3_{(J}&1sESW}G8i?@N*+0Z_(*p^Q-FpdV6DwPLf`0LstVKIf)u@!kLM|AlY-vws4^ z`cgpca>Bx6Em9Q+;|lZfgu1Qx&ENYZzVAQ237@+C9!%RU=6M1XsIe2k2vVn_uUPc8 z$t?pfv#vO!AUj`^DgT`H)*njt*uO3kam)_8IT7~V927RtHDwPKuuvi~oLv*fw>~*Cj?KB@&PEgX5$(}SqY*HTm4SEr~6z|7Uu5*pT&63`RqJ%z|ud-3}ASZ z1f^glYA&>X%i_IxT3VNHm$%yxOP7-;Z=Vo~phS1iLU!?8VF_}@*hiR1` z8HhKSNK!OrgK@x0*#1&w4AfQuB1An+gC!LV-NRJaq1`YAiDd)pg_ktdNo)z2Z>Cc% zzJcq%>XJ^s}XeuzU&J>4?pnFz73!M`7eN!1JtUhb+!p{K|uj*MM$chO`j`< zVc;cKE<6)w$Q+1HN)ymRapKhyyI-G(e)-*mDWJR{cJx8GiWa3}x*KQi6;S1tTgp~= zD=7*gW`AOdow6@c0K&j~)jw z+b8X8E0!yP>2NSJvjUJ_phZB%fH)5*f&sXx#)x=FsuAdsP8 zp157MtOsB^i_M+Ci}~nbK#yaxBOsTLgVlQ zBeNt~?*N%ZAOPm+2;0XWM467wq~xvri7#^ttjry~&+}Jy_Q;dp1#YWPZkIT#MVZet zHfPVEPTSZiL$Xrlo`>m~h8-s7MxJ}5_RC&6-E=RHlq73;_OY8Q@^O3$mXGU~f@g6n z-zyZQ07Vqj;c3)|J`BC@{TPOc=l%--r5(n=&!4L8k}6_n|Gh4`K?iphgxZO6$AFb- zop?#`@%~k zvi8XD8E_c~dZ$?s69YlAaF7$$CK0LdRmr{)jxq#d>vi_a9;#u z%(OCf>K6$BY*BC?!~6*F#CuWi{wd(G_tAeSsPlwryM+KKCoV^M+E)XYe-X;+GN7!( zz$sYwN+~FQ{7jK1@OZ37)#Yfy72(|zO1mIcFq9GN^$LoLVH`2YfagE^M*OSqcs2gy zSHBE09ALE?F{}m*;|M@8PaCYp5`BiZ{_5}JdtUqVxa+rvf5@A7C z2c)U%F&H1&H$oTW3oNgFW9>{rI+53iTQn5(XkqQywv6nkM#ACGC>WQ=f@nVNEy8-d zSyo=jD3^=J3-ElqEP|>IqH%RtGUNQY5%!gnKxOA2b2^O{#L_Z>xKYV}f=1!Kg1ab? zp4ctBU?ZIN(h5IC6z8kC=}Ky!XlX24g<6KGH|h;%R}YeUk^c}-7tdwnBHE!LI&=}E zL0)m`WU}ZbWylSeb%Kx^h=quk-TNjhr_20*C>3-#{aCY znVdB1ljm-oS|t6yb^-+gohmSMYbF%XO|@B> z8LNYW`q0NPfB0vhkA4K3^N;W|U$9SzSx1s`vOAE)x4Tn#3WgCFpGO+4>*+d?I@&P4 zz3w=VA;v5}k8Jg|x7{AubTAO~>BV(4@VTgs?qolhF7uuI;eG-|!Eo6PkoC!EalLW& zd{j745cp+f*je57_Fe4WcK#Qh3x(~h(Te%uKLAdD5}U&(0kEF<#2WLD!r)W=lxe$H zM}t)-5Y{Q?`SIkP3L)`s=*fXgX8GhRv7*_TLYXm~-=!B+9Nm8xbjyJUrI7ThWkyU< zk&N~TF`1eNV^Q`s^v2pfvp+b0HWW|A&f)d~pc?q9ND_(HP0vkJ-YpNt1+a zF*<{1duoddcv&@>LCsEx@TdfiF&#dNdiE~pBfpOMGe3cP<`dAufxJ}GS8UaMb@j_| zaNXCStgixeZSu7pc9~W`8fIavTf%%{w0r%jJdOw39pc;JYXyd(V0(OwT7iNAH(zrl zzVm_*KAoie--qbrn|XuTC>`p71Nb@ge-cfBFU7`@ln(w#S(3j9DkUtH1}n z)L&S;#%Gfu1#a}aPwa?`pNQJO!&^S`8*LvaC@Yb1aRPS4#C18S;3pLWvr_Lmow3h? zhJM2G_wtXpUJmvyunxwet}P+&xPp)o7l#$R-x*?#^t5`En*D5$>b6HuivfU7 z#uzWAD}A5bY`1Dehx@xZN|+VdS>`eeWYz46Kbn8PuNgW7A>gY1Q>1zJ_dW7chO6u-q6w82Qb~zJV za~u@j9oi2T;5h|-PV7QaoA7gmvx;cO#G~*hQJ(~pdGdEAG5%8cX9cUN!K2ffq6CxHKhKxAUsy|vS*@CeQR%cB>5$Ig`YhstK`^|_Y%6`i^R

ec4oZP)K~+I5BerwFW;{$yQJZz1)`IvVofp8>F!xrTGS%)}T3} zp+Lp~!}?OJZvHZiH@*;?ndf&a1Tu05KvjO?sm?aQ^9G~{&s+{b8D?zn{vfs={u$tj zKg6_o0tMUxTC3}Lvz>G`J1A<6mVJ!?wu0DzWzaguAfk4iYj}0Zy1IfkR8ID5FD&Yq zwTY=^zeuIFXA4SOT5^EWF|5}ZFTEDJJ{9L`eRu$9d;-b~nBQq<38A!l$&2hu9NAE< zs8TVW98ql&U|6r97tUbw>ED7LJ_enS`2{oU#Hmdvk!9lbZPB9EwuU}hxJ6AZNBD&d zvI^Tfxohtor1+6rN+`k(R1xrVUh@&^!}oH~VV8+PeSxucPz9!6u7*OoSrpdhr9VEH zT421ZZ*r$?pUypjy4i4|EHjeG09w6tx>$zEFS~(W2>ZPJ-P_+~xI4sO&7H2OFeU)u z?dWdY>g0o(EpYfS>H{CZ{LsfxF!O65;QauQbg7yPwD$Z2|MsFLTY>3Yp{J_y{J*TR zzTs93C$9h?JW6E8IRrl7Y3!)6;2}MuVW@9qW_AfkpUhREBar)*;FA#T$+7Si?FFo{_N?timn<4c) zWcw(F`EJxleg%5Zn;?hxLB;|U!Mxd^)+y}KeBznFbzh5e>ggC(mvVw7%&)L)OQG%* z<|kf;-e{?{59yd&E=(~Ut`qO)fw1wBfx7~VjCkR*Z^8fZcfSc=@s(eUEmkN)!D<*F zgP_)mdA1#cQXo3x=im0b`0gKmJsy7SG*&C_{HxUl{R*2XcOq<3W}?7&JztWvn*A0N zXfE?yb{^)cWP?)fGNC+FyJo#rDmy9`xXh+eWfI{dq;q(+Z>c$j-6 zw!3$9qtE#DoH}5%#{v99%F6d_Fwnru8~MimfjbyOLoT#_uc+X0Y(gtTtw5~Zlkq_}}G z!7SrpNvtqe(%=+($)v)A)%u`%ALb<(9@xY2ci`bpOz-U=-Z{tx5%^NNTq02kn?G-< zbpxIfBoyJcsIX2pJrZs4-V&#*2n)6Vy4^dtF?z!zT|y?gBjv%pb1#S)Rv^*gPC=-k zN7*IQ{<)3Z3BQ=bD`k>bQ_DXdxcVh8F@Km5@XpW@bEhKlgAlxNoy6VV!q|I~$b(Et zNjK&Wg#%67?yRbIrf|mL(II}~&A);F{9|v!_HY9g!O=#soduAQXQ2U{ICTYdJc*Zm z!SnDv|KwZng6H1~krei#1;5o4kW1Z5>p5`y^&nAvC zPKC7i^F9)CG{eDT$zm6oHTv8kHaMR*GdtLqJRPfNeig#1M~LdCS9bSOnhVV6u=DLCgj_SbTQ!dq00EDZfRH4Q011k&CPMceVm-C768`-XU^P~{9?`juCedrUw*-xWx&s#@N z0NB=OF&Yw;0lFBl2w0ZV`gZ_$iPO@UxpU!tQGb9uk~Algyjo{l6_~ci*gp9LjvlZ#}q^+^2wl%-WopNyL!RnFm6>M@F{CwdobUJ1mAZ_3eO4MK4)Bhv~ ze0GTFPPf0S6AZ89mcZz-!MTT&go1q8N~;eriXZ!#F>jv4^yqE4@Ts?BB}cr_txhO* zw?qtj?Rb%44D4z)4N0dce~Tprl5|=jC?_t*aK$Z=201?>_*nKOvq*ZQy0Pqn3kB>ILbhGoj-!90945 zDRy31Oj%2A2(nB}`<$t)JMD$^B_AI&v_V$2OC1$jk5RX$f$0&*;isVYyaBlTtLrBa#<<&i-Y|T^I1_kS4^6|+L z+vxxSzfut*@dT}~HR5`EX#xv5MGw`In0~5%6w`x@h9J~m)4O}Ml(aAL9$W`v$KS~a zi98Rt3sgftE!&8bT&(YYu0EKy7<~$7nPp|6j^AbKD7>sFPWmU>mo()luw8tiyIrgt zS?RFJktMEhb;gix>VXqs;Z~p89RrytixU;7Wg`A#>B7BucMm$7t!yt=2f74__RcTI zF%T?{Xtwu0w)YcLeQH7RB1YHV2>=H-BEGG$GsdQX`=PO#^7Qf~I5YOhbz(<@I@s%( z7*3s<&!oEXd*J93z{v%2+bV}$D2J8pKkDp!VG-ME{u^G2P$(2h^Uq_fZ<&F z0ghoe(ULYagOkr5wontEl0!-PvBPI7V+2NL*|QPWwb&{SD-ip{oz4~8%>;#FHLNhK z1ZU1Zi64LCui?M^%-b-{6J#iuDpwL@HKGcznJ0_~YfK8f>?O~^zy4=`2`_o!=kn%i zr-dZjpb7j8nE1KQyba2l2j|VwF>LXk!R463{cmYj)H}_oA?lDM1<7eCKl8UJp46Hh z05++TPzkDCcsK&9OK@<@t1#a5LTu(4lidOi>qtRj?>Xj~y9W?k)f7?`WhE%X7MoAK z6Z6MjhkEAIm^NoHrW;pGMM5A>r-Fl1uz$z~S!~yZZ+R51=rWGhy6%`MqqOBv zoB)Zfn=sk;h>&a+2a>HLkPRhYGAC+p&L)$zj>9hBg@c|`*IMVM=>WLM-|{O0E&Mba ze2}An+VYS}1?(1f2vC$qH-^C{ffVCPpcfv)@tyC%_V@`K&{@56BOUeA8m^=_E{4Vm zb(J(bv^O9NB8M1L?hyfIYdix_8xwO){(>0;D)hn=!1*UJj05KCqbWX$D+ORjDJ)ps z-~s^kSmW3UVx>`>!&LA26ckbD;d$t^Y4rO*+DY)b>Bz+Rb7Y;|E)Gt2=M(uXLdC*7 zkL(?`nH_4(bcwC%Pjlt%=hFq~g$FU+{acVTcVHY9;~M9=K|BSe;kan??ci zlLFgCK>u1{+yD7DUU@x+%bx)Z2TW6KGRbYSz`Ak9m-FenSd0cu^3jlmxlKM^J^|7% z96~)jwUZ%pPvg6T1n|iuGs0G#yE^3Ur?{;)o@{=q)j=KySyT-xU9T&WPrjhwFUW-LHM~z!&j?fbz%Sp z#V{7E#}S`<%k}uqzxx;PiZ6W$q^vOxf^jvVj0IIEV46`-QG}D`vwvNHcj)(YM7F`q3 zblsl8gY(U+o&ve!3w}a2=vLkLwRel+-UTYZ$;itkIJ8L4zlSz3HhcM~2|@U2-k?E* zycV;~nQwnO56g^PHv1rjMVU0U%j5&tvk+i#G4x9yKTC#NSjNNp;(gK-HIg)$KIH@e zkhtlx*w0J@hIg@)ltptWopu^_^Kk#=88&*x+fGfn4wkHuqUlO13<1C2T&qAZLN9q5#%Fvb z)|X#n<+B{V4?ro}CA{eNfBR1nc;-h6)9fKy2ue@O9xypq{s- zL27V((9uei_M?m=FdU$qx~BDsYK4k&@}m-?|0=T0Vd)fQd8ly3$MY0Fwo*}J9}(&6dxdjY$1+=^t^j0f_YYc#`If7`@SG_w9)Y{fsq zEEA`t^g9}0dWcLdi-&Uaftd%XB?`0RbvGd;!NF&+=6q@6&%C32tN6C>in$(Pd-M?M zg*#Cndl%+AehSm$AB5@#u))7TA%miffNF)-0zLJ4sMmcpaN-7(;ULM><>$8Bg>SDe zO7){nL3RU68`KxK)BJQLkL&SE0HQn|usPm9WI!2K_`F+g#Q*X4{vuxW$}fh>fMScf3jHEW<)-rP{so!J#0PZSUD8bTU|2(^JdalY5o6isPuj*ahJ?4`mYR4w%zI7lny|6E=7h3{t88<`P)7v2VTZNKP9!KQ-w!~sTVS-b7c*R;|5s>BMTQL`b z{B@H3GP5jz=G;e5w$I@mWu19WPdDsJca%dDLWH~R2+-VlXhx`o8|RtE`04!` zbqk)2D)0D6POt+>8FL=Nu66smGRm1>L<^&#H`No~4)2}o#uMeKYFn8rFi$h)?QCcM z3l0yD@YZ*{53l|4U&515p2cb`n6={IU_dF#EsNV@-rid(Uhu4|@jZY4&*O_<@;nUV z0YnOFt^BkUU>$O!zoykG8iv5K~~xE z3;x}<0?r-nrK>Hy?9@Tww(Qx+*2>c$qww7J6Zd0t&-*bQKM9p>TfqXd(nJ|C17<}2 zDXb*A7S`B~KvJIr^3jeanNC81tFLzi0qP8q3H8zYFxCkJ6vN2RbpmY{kN79&ihVZJ zXraCLw%z`0*;ABfk~yJf-zLx5+kjU$N2tdantxisgxW%2CH;09$M`ZDfwU^?e;#6W z7+kr{*414(g=b1iX%k}GxzkiwpjwUZ;$KxE#xek?N6@o(V{_X(F`R!0!%8vO_HGwK zg|!1}^xGthD!r?42agw_O`D_>F{GMp6SrOr>ysF+y%jjP5`bN}T9x|W5Sjf!SO!=z zhQnV&F!tiGhUj|Wg7n71?PcrAt-zYfEtFTl9E3<|EyyWFBogQ5gtJ}x6zJyOKk^bmsS zAk%TBQ$1}}%*PYTz}5XS4nR>1WyDYhy!bh{;D7%Ie-SVJ;+J4k`B_@n#f5dAp>stk zg0U1#$6Nf!Py8zW<4^rEj<*|(>w@CpIiy28&DMlv5zc~aSDOOv04FZHNTlfuGwns2C^x9JHyY7m$6NUPWO^j(dO zzgC|-uTHFaQ0!!j`FkW+my|WoWJUj_fEby+j6?Zk`)1&@yL%75&ZWsmjK@W|+bibP zgv2){YIWKCswZY_(&%?RG<<;;WZ20dPDr#wiI44ijmlAgoaH8klFMUms`Q*a+KFILF|azoI2 z`-_WZH~CX&VX)a6E#KCO=vYg1f{V`%3upF46?NKTJ00U4zx!c)-w*#R9=!KqtV+S* z@fL#&(0PV#XGooK^27mTwZ`*ry&m85?SBC;|Kb;67*9Zi7t&!Ukbyl>i3_dxy=kBy z#E@dvj3tMmcHx1Pkk1@NU2tB29k{NvMul<<=|F5-UVl`=8hcke&jK!A&(7&eWo+lh zxN16}tVfhfZ^ZcYS7E&3T5PNG^H+tJ1*&pFMhbglq8vP^D$2ms(mG8L%qXh@Y@WpY z@i$}s^xJTB<~~fD^8ggpFKYAEYVWARIt^9;>?hb(WA86nJu_7?IdOG_eGyl-24cLr zLxc@ae@2jUVchU(71uLJ=tGRq*6DNd18;`jk8&GPh69Y3-Utk%1(0EuD{~>AY||-Fa|b5SzRa6x;HxD0+nH-uGiTdVpux4Y!I74l}Jn-9xq?i}2VPw2y7D z1LlVp_5q6`b<`Zl0P%X5TAuTS>F_*`?*24J(`!+liM1&3s>0TZ`o(t2(b2bM%YbgH zw3T@)Z#s$sn2({R*8%C3=$MDQBTfY;J5%&Vxycir#^W{Q%ak7Od9_fri~3w}Oi4M= zuN3Z{n5QGm=O4m!&wEiH`2@yshUg|%1bHc_)gQ};>z__5=@#TFmkLj*kA6iOk6snb z7@+Gbx&6Pana*|zG`xnwMUxG%pzFUV`ZNG`Zs!MDUCvP@xz*|Sa4Q-XiF@YAHZ&0P zunBGv)^`Z`Cyr!u9Cv0d(?*6OoRK^NAB$H2;I0f~+QX#BWcn$9h@A*gs7$ESS>X5~ z$oY?Ay6bhA@B1a_{1`t0TPkXusKc;HlQKYSfee?ST>BM}%fARxPNZ2er^Fas((U4u z%zvxQVq7$Nv2DowIDUm42P^}V3w2ikY>qe387LU>lFxkx{>4A|X1wfWFF_ekK%kg) zi*d~b1yNue3hKPY`EwWWAAkDS@w#9BZEUt%Y_}WCbw;g~6129P$4G);{+ODYOnHB(|cSw(1qJe<&iKRWnz70z0dM<@rE%pe~S~9AQg;7Z1&70-+m)JCsXQI zcqTEBJR4M+t);(O#MDQO_&o~P1-fb`&2!4AWU*=<_1YqN+tZzwhsW)~x%Pa5|HvTm zu>eN#Oyh@7fAwnXc$Q*YykyBk5O&=IBbL9r{c(9G-ScvAbPXEKp`KkKm?UhW$n$B` zSvX)5osPUi63}Js@Yy`~h9@u`u#b;+A$%`USTur!JW!5Q!VyG{urTau*`#D`LE@|4kcv<@4VO~ilb5Q zAZ1pPT6Nv&i}2NXUnI`OAWNc`;yzrT!Mw-EMn?KJL(==l!1IB{^ zsul11;2+@M{pee9?|lzpWoOV2)+c}hOtoUJ6IP>OGgmz4>DS|5{)1QJ%U=F6$Z&$V zX9Ywt^vz&&$k<6XU9*k_owSmne&~wyB5*N%YIhwp6nyL2gzlHp-L)CSw--F2?Hu&7 zkW`(Tu~LjEVX!gzsz9dG z*nITopm+Z&rsGFZu*F~>RYB!;0oI9-i!$CKKxnn2)0} zNJ0tg$-tOgQ8Z+dRvCt+Bi?EQ!bh0Hfs~3rH`&h*djw?^5Ervj*Ejtpbd7y7JE)kQzje6^Ny`= znnPDg7f;K`A~=2g%r`UF-iGGQTv>Wx*SIWobtcmoV&pupXg_!j)sFZ>1sm3IP2ZL6=6?lFMPeHhh%+Xrns)e>V}KRaKZm;8gbt}U^5 zThLHZJN)IcNs8*J6fq&oc-eL(o5YHh68fuS2g}r+fZ2!4n9C*M@4^;(oI&6dr7_RX zA2GS)h(bz2ms%(Q(=itnefsdFpT|o_vZKfpz>d9XFV1p!a#qN~ow8KupyW%!`SeQZ2(P`S0jKAOsXG)U#YTJ8%Y#$z&{ zJ@i6yfhHy0o2pX}kHM#vY*J*pEryu#n*NCMZhxI2wM^8|nK=)<3~26-;(fBYxc6s= z(2Fe7CTFs{#NO)(Iu&e12z;K7XX|Z!U&)3iBxvj{e7Nd_|txWhoH++tr%I3Ma_?N|3 zt3ZYo%Bh=BZh8e)mtO@{>o5zC3P6NACR8z34uYf%>^ur5a^|g%?(L|@(Zi^pcs=Ca zci{NR2La)I0BSS@Wh@{_+|sH>d#*PwKQfWaNkcEK-kCp0F6C=7r7BXA0p5_BEc*r( zHgV9DnjM{lf<@?o=H>J<{<0OJ01C>fYf(;K&QJ-0qpcVFHaj=Qn5PXoyi7TsWV&KS zP;G$8)Pey5)fuW4gC1hK?|s1WY0T3RO8%sxdgd-?cCJ0BlUs7PvS@D|SUF51CUuUALrcyvx~Coecad6lWdP=ZB0tTSLfSlq>Yhb07Nit z&!L{b57TGf33=jnlwpF-Tj)GPq@dVtEQ*AA`;8u;IAg_80bWY!`e{1oV&u*T`}`XO z7*All`WevG6}GqB{LKy;!A$Ebt?r-9<5F&}OZ&h>jHK|);%Uz;%x1hPck}n+kQP6Z zdfoAQZGy=(Tnth*>=MuvH6*#b;Zco%ruTenEYZf%rdKE?Xng{D{x;}iZ^!nJej4@k zC!yE?Wdblk>x^OK*LiB4XxC~1>I!n=7T~(Cg`T|CKKVDsjq+l5Y5+DFs;zf<%~6%d+qACm zgX?AwEuB4`q{xtEtCrd{E5eXPBj(qVTHY;q`39#UiCbOIcFD~oMsQg2d;??$=I68p zyW|Gi9I!WIB%-?vo7hQ>CLMuof!oco(`&awiOh({o#h3xI*HZwUxe}IFT{4{ z`Dc_NKH0p!jD{|mXR*hwog#jVPQS6seklLVk9rMltuEOa9zXz$kh^!nR{Cz(EW*s6e)K^BW4C}^zOjV@LDSp>C|zWmlvtCYlySV z=j|5TNAHCko`Znrb^|>l!;bO;injV1qX=HM=wwJG#p;cj9dm*0{vpfF-URM^S$rIAX|t|JRYR>=~b^6T20^lZi1!`FbN}gw|grrQcz69Q02tq zTrR=tn&)6RaRq>4$FeLP;L`3@u9I2+Ms*~cjJXUhDTtNZsr;7gN?no6Tr^MD}b@^J`^2LH^7&_=(%{! zKmDtC`m>*b2_x^V5blm6@2umaR6O$F!}#tWegl5(w?Bl{dc-gqKQ=L_Zd)9j$6ToJ zfpxP%5#&*$T%GSEJ=dGm&Y1?r0*V<{MzkC61r0Cjs%7i-+ex%YA@kzxy!U%)yF9wU zaEcAIj3@dx8iR1t>)>bi(ebHP$m(*5nCx?C-jSRk*`}7x96R|T(b*!qXe_&3Scs0# z)C&mPnQ~H)u)xXkHEs>3y;~79glSL_cHef^nq8H^(WB33!mViSNg^==)8#m+vU#Y*vtM$d zu#yN1i=Ak0DHga`%{)nmCdER`{$$@wDRK4l*UU!C*&M{VxAMaydh8{_oZFs!(L@)0DM<1(KbMQL92`mO6nT~%<*mN& z#lt_Z=blakI|GcaW7LsPB<^-mcy=vMcQ_=0X2cl;tzwZ|KoPUUxt4i8qSkP0wcE>i zDIc`*`_hH05%a{QfGM^EW9$ zF3(Vs1+EsM)vpvz{!*cPa1?%v&d!2hngGZOa`I-ZZvIjXmtVsUo+`A?Oj_;cXJ4&1 zW9_>sq!b&77utrImoDn*+aaHL9m?sC;lkO60UJ#59;IA?n^q}o@MUi2g#!0DFYDIQxdVnazqf7?p}7?hUv+k`f;yf;x%7H28g~etWk+nb z&Sd0wu~ZPJ0Ct|=@=+RJUwN|(ep8foErmQGG(d+&*?rsJdq- zESqqPfuEY6$1&r!NZ#sclA%S&nxWG%HV@y8d2__ew@gOt{5DxIvE>swK;8gbT`>7r zD`wdxO6^5E?WoXs!uE;NsMEIJ=9wAFeIhEOb^M)oE2n_Oclb2F7{DZ1NbAcs2t72K z#RkyIyj8%JT&dU|o`#;i8y7zHHk9K>F^tt_<1}_n`6Px3uhF53n%jcJ3ty?DKEQC= zwG^nGJ1?iM#dz7%0j#JawjiUHmXPJL`MC5ztJX6bVx(g&4+ zgcAgzZaW?7WT0EI^=w!lDpv74Y+u>J{9Tp3tuowhAN;)~A(0w7Q!(p|iVKkA2cTzu z5B2V!#eDa#Lbi`{0#_<9*`;_=Fsw&A3IZ;`%mYwPK~KF1dgWK3tgp8FbXdQu4RX1{ z+-M-NMw<^9NhAQ%m%M^$0Z|uooyloKuEx2!DHGxo;Vu9f3XYFASe;m797cTE=iiFg z{FA?m&-vVEVHnpaMNq~8>l34Y`4+=apmoM=x8IHL|8H-_M?Q52P=RThG27Q}5W5|W zfK~+iAs4WhVTi~WP)3w=o2bAh(=6QYw*k_`n;*HbhE7A&oE=u!#7WMa=#xP0Ehc1r zu$>t*Ch}Oyc?roke=c6oFOKEFY_z{yTpBLA1^w3{n1%7|;%e0JUF;_i#`0ev)OYfXUszbYR_Xph<)QSys^ud&OJG+PoR3qHZr>e(Zj%3POL? zbdmgNY{&H?;$?QJlNh$Z>R*i3O`bt>Tg^wT;@V2;;S+$)fY>(UUH3sz9AhRwHyS zsCC3}*|V{F<~KktyA@K_T#=nkFN+`bfR$lXq(;C0`MnOgeEeO^V@Ci4EzUUrv;k_E z6U#%Z-CtsD*SO}L03!VI!Pmax`S{L%@U6Jw+G{ba*4(UO{gY`sp@^Vp#i}Si{>j_% zT|fAG{K04L#cC)hV>_>)lI)8^=X8SHMqGrqFznvqDWBron-KMcL1`Rd2%`Y7n40ZX$4jzZUM!TgjTgkn4vg+Qg#wh(6tF&pg<6}_;-zT=&oaF-+ctm= zFb~>UkC^0Z?yh(oVMf#;T}+gCrcTq|;-imGeq|wurx!ZH<~bI@A_0E{X;R+fsL8u9 z9~G}lX>!?Ua5ZbZdmZrr_cl5_d3x`mjZdkn)U%)~aCXQoK|?6;eo_wGn<22Ezklve z7Agzuy9CfhYmqb&AK-}$Q<6{CS%;i73LA!-JuRsHMcih^J(r6@3**~TULEO))_|pP zipCa9;BwfZ!WEB~$iQRBBC7Me_zO|Eg7vTFv3MFRDakx&{Op6UHp_qo1a*xevuT0C zR}}?-DZkR&UK*brI;(sUhD5(@LG0Ld6?2ju_YN24T9Uqi%>I5USRyk9Zn7J#=^4!R zbY)&0$TI^}-58p|^A368{#mR!d|5sj#zy9h!iOa6I0_*Vr^R$J6D;8>`wKcAlL@d@Ju+6<|?t-AW`THKt|L{ zZpP{vUxC$S*RVq;>^udb-kG!W|Gw(1;$ICA6d52GFil&iDr79c10O*7r1$xvb2`2_$f=5tR%=i}J^XzT)6 za#@^!=@lK$@1l!Lzb0%V5$4~;i7;c>d^ymft4JzyrT(Z0FwfW?oKg(%)AcqIk8d!-J%{p0)6tMm>+%{>YZ-}p8OPKtk6+Wgh!-mbsmUVh82nw%(DO( zQC8PLul)+((ifu)2R!!=*00cCJ5#T=D@nW#Dftg^HWM6lr|Q@h9YCIQe6=xh)Df@N zR(~rLVz-|E3C^3f96#$#y|bL-;ArTzSefO0mEtq83faI%l^bX zV?I8{d*1(X{G0#wOL*Xs$D#9#sx#ZkPy!<)(Md0xKzBb$4Eoa{DpQjK^+1{ur24>V zADgqXcZ*5z-6mP*rSuucpq&cH6h0yDyd-^WuC}6In_pvHY|DxO(Y`0aXs$ago%*7Y zGh=zUyY+1>m~5I~!jCNTXmlc)v6XCZ;?E6Q5>sn)v$y+Y8`ayZPAb~d*zjbeB+e|m zfeFiwR8a?nGFOQ_DbJod@8uZU#H5qb_%ck1e#wr27M$BrOUz7@N5^PHp@TN!Vj!Kk zJRYA}I?20{tZo|@2H&&XWh*nEVr1fX61hiIo8)DMwNH%6u@klfO^E6ONeP-TgYOVp zkC&p4S@{;bMNG4Ktr7N&Q{J8dQPNZ0BL%r%W1)+)2q5eeR8q2@w~MJyMiLAqzXaly z$RK3n4XGKRWw4Vj&Zw=pg;DVul`K_fJQ@T}e=Z_9uf4l#D|*=R*bgL$kt0h%>$tin zTbM?N(`appRNt=3225vCjv~{in;PUVHtr7he!AyZ~hJZx1ae{TsVIS4E}v@ zMcvMrrx`%SYBl1-8u)+z>6hYfy!z{KaOyHZ3ULpDf`OS8pw@IAS=&2}U=m7}kMYa6 zyQSmJYD?ms%|!#zUMU{22GTw3wJU2!VK%+dZstSS@OT`i+e4|>4~rOv-Se-UjLe_) zEJc7?QP!t0-uQB?Zu&yZ;N^eSJ{bmEJt8_E7${^#iRp&h{<&weprT+FKn_-b2&OyV zgZj~*hMvA1M`s^pH1JF+FKe=MrokX-fJIFwgv?U9ka}Wo)&;CLh3h9nC<3;H(Ry zWST`5lS_WuWT1Jei^`H18TP`@g6g?5&?g^<429qARs~kz3bLV%tRUa3{b3lwrgu1HSd^zXX5hZ~b|!PF{*>CY_~-EwXY! zLFbC16aMEr--mzwBfp3z&YmYf)=r7#6`5uTCC`2fy^9rRS0StCYDZD1u$ER_i{r1v zAl_HIt?s#&h{*_P6+Wi-Oy=h8$Dljg>4k+B4^EMh;a02#n{ue4pzXNo6Q{Tiu|jU% zR$;`+NWlm{N45wIXnk{kaWU*8Be0~vJdn=5?deLrOGYD`y6wK*NHpX1qcV9s<~ZHB zboWFwems5@UBVl2+}%5O2i1x4jzI0hjH0k{ODyyVYP$f}!X+)p<~b00J!i@;ClgiR z33I)yf7VC`52Tzy>Pqj%cbA(+XwJ^hsV+t6t|qJoePy~h7>*r7lOV|=$LXRP2}@f9 zVJBSB`XBC{*vpUh=CX_Yt&(_J&&xzbXO`QNm>we34O9^C6@xPA__T&0XmQvl3m4_a3u4B+P7|ih7Qgha_u)r=?5#LHI)cc6?F4MMGv-M#4BW1_I&py2 z!HB=|XJ3JD|6g8>ORu~dfbA-<8`HD=%HS*iYLjv4jGWQoMQF}oGyB8*8OMB0B;g}y z`skwSiqbNUbm{5AonJD9sY-dn)6v#J3Nikw6J&X_GnE<)a3NrxIT0YIZbrH3%Q0MW zBeoL<0M)*{q0z1xHA6!zhG&{4)XMMO3kok2vqpRVqu&H>dn5Gx-8g*W0d_DUsB_Yz zBp0q8HM)aj;~^poqT#bX0tX$%`SeatgIquJ!=a_LTvCgfNpT2kA9xxQYd( zpd4HUU0oI(5w=p^L20R~XJ6adKAIvnnH*qw8VX3Qt@B&k#W%;-%HsnU9>w;q_h3Fc zgL&dz0J-C!U<0er-tPHoUiNFr+VKHKZslg)(U#=2c{fL*0pI|Fj7->`z7Klg39QDE zH*_ocQh<{*O8OMSPjz`mAlhOgCk<_wMl8NLDYf?@=hhsSK_JJ6km)cD(i^{45P+?q zR>{12q2%~U5NchLq-*=$Owz=U))9gY)Va%tDb#fVfa(U*g~u>I_6PjzUzsdJ+GF+E zB%`@~yTfFqNEhAO>Mm?m)5{=akj5r}O?n8A8=bli<&vjCh7kb2HsE5*ym#_+UCMDt zTKsu63h?*v%X+-9H(@+Hu6YZ3{fD`|9-`?BcTBjy$F(O5BVGYN*0YEcZr35nM7F%* zuQA=;>81^<5FDc(-HGY(-@$zMn=#%04h-{Y$S`w~XWl^O*;eX_sX#D}D+mgvEkFAT zU17N7nUEX)B;=BtFxW+Zv@^6uPWO`6=0_evtX7BVW3dZ$$r`I(E_s)TdG)-lr{OB9sh3zz>ZYRujLY>=6cdM7As^cU4lRL_q6Yn)lMYb8lLsyeRbEST;-P;3! zeRZi7gTTA4sjpETi{oXx?=&?TyW*xvdn2!Bv8NBJ++E>k03&0E7GH!%N$8s*`DDCU zd{>dkIK_2zu1D@nvRZTt2xc!k@>`-HI|sM;sT0zR1^_2r66yR?X_qZ1A}!QJ?S1Fv zgh=Mq!H}xQflc1pd-xj>`%nPrWuANiG+{dfNfv5q-&)+nXr!T^ptXl;VZpw~k2J)V z8iC+H|2l-rUR-1QcyYr;=AcE0PG%-1LF38NXsRT}lwwI+kBlzYIEP4i5wOT6hlsj2 zN#p=nWeIa~|W8>L216o&n|Ztf)+2wc{6Y-uwr-2f3R=}+$5A*YA0O7!P?yhG@j zcq!1&BJR!KA<4-3Usi_@0@`doJPpHIlrCq&qSj?{oc7MoX~}*tJjt`s(5W%~`z-qi zdqDs*9^xvZT+tWL#yjpx4-xxRnYM@eO5)--D9TtUXF0%db9a( zKqkd7D&#;=%Y^B+w*$BR0%Y?LHb+lzj4&j@sC2-<$D^u&(DGSRx#nra26%-y= z75|zuSLLA^v6-aN8y6?}8CV5soiGf*FihCq{$AjTKZ5FUODg0cVQDh3NV$C6JG?r( zk~$bx7ZsLKS0DMpu!Mtx0qTtT=mNG6+zB~6;_ci5z|O13K(p|VPU~2h{fc~TN0PW& zrBRr=oijq+_Ca|gh}fWhbKxB33+G5jHJNxiNwNubH5q38OTUoT_PHro4s#foMu|EX1k70YqyHGAXfHDF@Q53a-rl4zQCGv7vv>jbhX4WSYOAt?! zpUWR$y_l<@T=h&0SKI)R74Io9eXDBqAaT&Z3en~4kYwG<+=ClG=0Om&hP8SR(aPQ9 zIU=^^;XOezZZj?2gWUAm>@C(s;D}n3_vN$-E#`e(~MdL1AG6yHSx}bh zn}_9BcQS4t7Abo{L`cpaMqYL!J9C=|u?EL!cl0JO2}2iRq_-POi|bEVSUNi5_{jcJ z$CASs@5nYX{5^K2_Cl~UEoFzhi%WfrA~k#9e6={{aHd_L)6B_lV8WpZt*R_ z0@FyJ(4*N8Pl-4|-&mWdjFBt@AXhL#C*o8XNhCe7>D^IwuyBh}=f9EMYpPWu8t*QV1%n z*eKm3m=?VAwv5z;>>vwQ|+EQ0@xbdsz56pQi00;00ex;ke&Ee}`0d0-NZt+4U}( z`?Wd~X&`YN0$`__Iz}WEWv1D6jE;Rp*!wT_x>3f4o?)Ip0EnmhWhHe+J_Px>k8VJgNJplzK@ zm8&lY52q`@7C!1!p)vpmmti<{EmTHS8@D-m@ySA^{51MiCQF;~p-c*Q zde};0)h(tAPoh5hacu7SJrrzt+q?DM1sr^})`kTrHo4)SS5(_s0oaynu&%}gn{|ej zo=&=zkw8|LV7&U-&~gcYfnS2LGyxwE(fY*?aP<0p%=NzLiWz);u6R%c8_0v}^p zSm#4`Uph`pV7I5WLPlspy%(sBx$PpEjzg8g0Q5%xdPL6!Zgop z6P*?@dW<(?E~+h%Y=%!D*gXVZzp{42k~cwxhxze6O2U-KRHwOJ&wQts+Tb+Bq0pCk z`_6#Kyag+1hnMZ5t)R~$oq+9`QfC@lc@m*5K6y4Rt;h3JeVo1>O8)*5$HtHaWWe`q z7tCj0wDi*2-*EfW`m62}A`9K^lW<(&cE^O{e^~U15>iLk#kKk=AXBY$j2^MXNDOD5 z;eu;nIcO2nyc}N^S@UZJk=}D2fh;k%@cC@8GXcPaDdQ%gkh^hEYp}htngVeA>M2@E&9){Q8pcsDD_3F6Oie(cWo&4aM5FRN6(AH zZeU-`eLyz1PQ#8`03jowvr@aTP|MaCrnI@j%#L+MIRIZ(B6!Da%sQ^h!r5Da+9b8p5!{hNOV&wBdJfPZVa@I13O zGW-U7D-%;i8ww>}J7)JWp8WO}2yr+ju7X>C!-5?HCu6LvO^Yw4m{X9SDmv+kM+ob6m;!YLvc)+bS}eJNH?e>r9pOw}$TD~e&TRT{ti*lzL@ zvDMX?gUdk}L95#6VTKNXu2(4A3z$CfX2@N?hUx76nC9~sN9%+H(?+{}Wl6PKR;?q& zbCF(8`Hur-CKn%ZCkUsll)?4H?S;3mEZmf;A&QAd?{wxqlLISA^R#o>1)Q)N#{uKP zxQ{s$*S&hOvRBc@B^SKbev%##Gv~<)P+hyYAXEe6v+P)n>UW)Z~ z&%v;|g!OfH`)Csy&Sl(n;K^MXSXn!HF50NwAx8t&Bdbl$0t|<#YqZXRmsGW=)Gd#x zhLiZ)uS4f@`;z?tW+q5yXGtX;&U>gYCu`Nqx=qfAC%Gj5RtS+ zl1uQf|IuH;*MI#hp|ZwY6?2^c1wWI!nNX(*1r_(*doRBCwQt04z5f#!M}dI%9WjF- z*a>Z!!`jc}6VX8)v)$~qFoWw%atia#*u}!cjzfA~2z|E+)yO7@vA>*k$kYV1mj z879`7ZRkOf%GVaLXu~tKS|MNpiIsFF78Bb(QkUS94siRA5M=|W1u4vI)n3dboV@tL zR|=GnN4Drjw7b)525N8PmT1~>FBf;jPj#kI!U)8WEu~RowC&?9=v`(M1$PmURv>-M zC8IfC3-e&BPwh8F+XK#}1B=4l;h!1uX`oCHtY9)>7UiijRw{sZ4qE`BCAA3Q(HL$_ zF6e2gfTTi-wsO-vbD?@d=ArPOY{Sn6rTGZF!ZNPrh5{WS_TC$;iwTKj<}gd+Uh$;j z^!gReqPe2~l;pu*i3kzB`NKMP?wR>OlM}$!HO@Y|{FZ;7HsuvtyEB-aydp0lVrQcS zo5J!y_GrzKtesM3E}`H*!!pa<$=U(ZA4$A;z0+<1Ek6=nxowzir2eq7+{Kq*XASx(UP0UygFsEvS{B3LM74E{B>itccrJ zI@DGr1%hIeK`3@1U==`DC=h6!p<{t;&SLxFpF?@@cW`|Aerz`9A-3gxo+>;4;<{Ei za0SbgI%vGOoSY|fD{M8x<5*|1$tfpF&Ok=K#QnUS7SN=f?3B2ubEtXoifz<7V5%eZ z)Ges8##{>~E!bAp7gfPLRm>Adp2Y^{T)C3CAsGr3zckBkj8_=HYM0{G3dGIrz`U6u zbq1uOK5;kdgC9Vh&Y|iSu$>;!iAt-j4*rQuRq1%_#M31*#qFa<5EEM0Zch_3&l5I} zJ%sJU4+5(8X)>lj`aC4m@~}G3qPI3d+K~zFiWgKZ_8CUY(9-Z#W6&RiD}efYv_(BU z%Skn(-Dz#kRz40SFDb0YTF4}vSq|}AF%HXvNc%w^&cquurNF^S?JVWYb|!|7r4ciYh1%FE)M>{Q&&2InkYPDY3` z9ogB=iwHA}Cd^U>TP>x{)Y*1m=>^oIJE4#N4(7Yxg6-YEjxs-j@nD9Oi3C|+&QXg1 z)(AsJKPNA=`?a8)yb-wWPe4vS2W33q%KmHvezS|tMuoPEFO)WTsq+yzqB%7=4%4&{ zKV}mVq6|Yl!j(XnAAS9ZL6bT4oVIlsM*xb=@i7h#4si4JSK?p%?LUW?e$k6CuGdz{ z>`N+ zGgIX9Ae25tYkvI*wd70OC>@A4w*=-NpvHA$?~iUW~5b$-TuR(bET- zIZ`5Jfv>4gbdr}c@wf?#pslcUak9*^e+X4r=m4l%8sS=4H{a3tuB**8lS`Aae#T6pmoN2Tw{RX@yE~L|NgPJ;unAAJ^apa z;kkd2f?2ukUjS4oxZ#>h@$G-(Yw)Ut`&n5&}BwAW=da_eZdPq7uA8Re>U0VhZ*v{YbV zhq5Z5b%0J4r6^=Q0*8-b{_yKCJo#LrLI-bDs zB-qpeGX`!u9Y?HA9AH?jD9sA!#QQCn2fu<)*>5MkHU^*y*_Li!^{NV~8t3MvRFsit zgpY3fEz~FOf=(Mw(zrfk`M7{wGHJUmKt7w>Wx#R((%lR$8!sQ*4jG^pNlacDqe}Y7>G0^~BroC<0s6;_f02egwAFzrcEn#Nz{6K1dg3tALiUf1)$= z=p47F*p3Ue;`Z*0IDf8JNqX$_FwE1!=XI0R2xeEq?RYrB=53Ey$GT3H$EKkCvIi=* zho>QD@4@t$cVg5-XlWBgaRDbxb}@K!14r2qXmEVj7wkwyD^efqIS1Zx7gQC@I$*f^ zb1|H}1}L1&Z5E1(76USvKwUkgEk3x)IXIO`$O-I7QE~$|Ns`#|r}ufH4E)9Z_^*L19Z%t>99u>jJ5-d!LRC=)#ZZ8P3(#}7Vf*mAaeT)wpg#IO ztcSCZVFSn(suiN#iPt`%X}jnwV@~K603$Y=imGeKRbK?T>dS!>R|6Pmn+0}Koq8hR zS7Ur|!7q@cNdgm|TG~z!CU8#ZwMk!}OrnhViNXL^Q%g>fr*iIgqMFTh-Lj|86+m;^Sji(wdU0G!`CLd)$)HQ+Gl9Wehdm6q4MFhhauLg0PPwX!i zM9e#m7Z@mciL>(_=18S6!{0<#N3+>Z(@D35sBSY8&Lrbd4{K9%6!Y$&6`7Zz|5(J# z+k%%s6>+)}y@-FW*O?qOdYVU9@Tm|M`4|XxY3p;Q??MECt7FVq2Y7Pn3EwNQ=C^|; zk&Wh<`iF|ircjR~A#xb!P%F?_T57BlRLN6dE!cr~xch>TN zI(5PLyO+2GU1d)Gf~D42_<{)ZetWaaLQKh>{tgy0^G6m3U}Ea%wSo}C*#%}n(7&Ow zL1PQ*K)XUq1lhCM_hsU}lCVTAE#OHLZa-h`@!%K8(J;aqdbO4JS^+5oif_>zz}3VG zOw$&Jn?wBcTi=Zzd)=>M-W&r0466a-IAWd^s56SN1AF7Om*U(1=GWn?U->drW%x8r z5CuO|G_w=S+k9=iIqW>6lHeHpn*J;$(duzmfKhZz(ZZrJ+6U3VNz2*X)Pvl3HtZc$ zYJVM}UE%D6b@eq-Z3SiyD(M0fWn>DiwyrC}&auh>x#T*On_r3bHP3?90#)Jd{;HTZ zQ#6hW>bxjd{{jDoZ)FFl@aA8g)Q)8EyW@2=pgwUA>W6<4^7x0aIr|W%%@I%pb)Km^ zhS1k}xlTbJc-{cSV(>00y4m5Pd)>3{fjVObqnO=RoKc3TP--=3MLfjH~@oRj5+cab?}}G0FaTqvj_@G zO`Rqy7t0(_K~e6Sk;;p|6czI1-OxurjCnc>V1|foF}BMC142gLs5RaqEP27QMUt=Y zq%x|ZQmy0fJTP1t9Z6GRE9*AS!oDi^`F@Bw* z!i;C|N+#4Uy=y}W;RM;d#eDV*>UOe~@upvGbtS>V$vFydA)8&#(FA^Bp-rwb_a+~R z&3f5x4bw@9fsX=%VmdyL>DMQw7#27v-73d(p1={@m>Czb0_kPB+y64yRkhqSnHsVUigNLmlf|rsB=exScQzru&^3!FFE_yQ*EbCp?!w zSG9X7W=zv#*q;6%rib5w>CRt-p7}V2@epO4P-Kn?59$ruN*Xc#m4P#y)F{&ntWmCb z9?ErJiE?la%CJUNGNLx%$6zDt%9ZhgVxItX`%F%XF(jyfeYVqgNNUorkd^JCg-u3M zCZv5?oL+Vc!x`lZLrM?z_^CZmp-cfz6b*%+5}vmeGk|fm#>-#$Y<%b6{bpQu{nJoq z_BGaP9@kO;<2Yd2ZlKc!?|#om@clpXCOmfLENzSwRAs*f04G@UbY8JW#1$#-Re;YL zhhWG-(>@B+IYASIX-tb{?`l6`7t=*@zA_IO&IMj^p~A|+?N{#|kc&w{yKJ^3=*ZzP z!>C?n4z?qwI&VD$I!}}8PaoUTdtPvQ6HURt<78VJZI&lgzo60F87^v^Os=Nuo|rbq zYd8bDNs0XQ_hgvbn;R|TLyXRdm~e`{WKz{>Z*q*Z%AbbIUkJ^9@5bRH3)kKke0Z2y zrbb$dlF5B4zYeQK82;sJUh|qooCjl8Wdm&sV;z$vwg!G#I=hxQJCTZuu5u)+<%#uzxk0j;=;KL z7*_?;G^5CXY3Afdk&03ZPOJrg>(#Hs|N7Ve94@`|GVA z6JNcwGM5sZHGQ@%ShC-6~m1$23A*K7}roW9XFwb8V2)C4gqe2V$_r6V|b#_l2A={ zMQj&dPG4tikDkEM`+phpou9&LV26<9>-CT;`ff{k>8O>8a3_Q)buxG|5Rf+!>My{{ z^Nd1jnVmI-b={{bIQi`7;gT1;f`eH@kaBIDXE}L0nUqLfT+&wh90lu-Q)!XaXo4lQ z1X`671Ox9=0Tkn)n2#PsJ@Y9Xf8-5V9Y5YKf1AK<_(d_>wvmF;R!GgJQd~}Nx=%$w zo&{zPjgF96I*ug*odG>{3l5(D=P_LV3`kj{PWE|NODmvWSF=xn)G`dGL#JGe_k9rP z65c+GhEo>dNa;cZbW6ndGB%qRD&PY;PwaS79q@dWc87AMz7_>$tx-Qzm0tuYia``Q zJ%ahnM^GPnH>P{vg<*RyR;vjzR6BBH_#^)`actY*rIN-ntWb4CodsCkfYmeq0?O4d z1IEjEap~+w?YNUginTGy&+bZ%xyj&-b&mOjzmWn{H44-P;dEIfrJFKr7PiCV$wI!) zu*=wNgV{%~i){XECj|s`0?NS4i%S8@Fkl=8+oF`m8sBKdTBb?vRy4i82ZlexSPY?vDGbdnyFFO0ynC@m{1lY+z~#0e z6(XITVi|Z?NTGwyCmj3YO0HndDJF2A?2SB~#|64fv%M1y<4bs0q?}GN0`pJ#FxcB) zL*nt0el)!__eF6x|D4^fc#@K6a$f{r%9_bMZGuq8KKBNR29GRhiEu;CemcML$dBS2Qn zM^PZ>9)+B}ALY7dVWS5a)+f2*?W7k!F2+ugmuD^oagW?Viou&$&)UP5(?UrsC4~wo zmsE+oWA1sUtQtf{UW464G2vN3=_fLS3UI4CwfuA3Q{4l&&D9LQx)$FMqS z{T82Dah*4|5}(nr_0aUn{KM%Kgls~7)*%+*S!Nk*Yq1FCI$`s~gE;)HHv*45fN?C4 z!mY}I%XG>Iuu^RG97Z4zt&JLu*n};(8^wwDNfXM+^d|;z?W-ju)9gm`qHe3&rF7KussrSj7h`qn*I;$( zIzV`bi-yfIZj=LC7e<~e=>?SP=MMDo1H(m zXmwQWjuSd;2OVXqpdu8T>{6R_MX4y5FkQF{_4NBNKkzQh5BwHZ`Y6hJ2JFI5wOLHA zasvP-c*S<+$-qXwR^I%tGGLwxWV{r(?kg}{`!yIZxelcqZ~~~3F}KAEPEeL&MtKHw zNCRG2|I#7LHlROu?XRL{%f0X6a$M9iRomHP5{vR~Kg1Vlg_p_t1UW!kXS9mdpSdb@ zo>0Nda-aLm8!(pvANqqku-zPSmyB|!lnCW00?hM_kKJ}RuD$wlyy&^l0Ib|N$zYR1 z-5}nVty|rOPa2tRbPm$$TCy$XmnJybH*%$-AKxsGnBY~jUrZ}$9K>{~(omrzJK6-x zUlJV-RvG+P!pJ9w>el1BR30Zk_`}3w9docBz{sb z@%Y%Vi(>ReKJHv(36E-%{efr?ME%L(%eYaG78wRTeF8~R+3}31Da}$1yezWbNXsu3 zRisz+D(7;{&{Mg`uWK_1!*|C7fFTn^EoAi8$@45@D!{4SlXE|mFz`w$iRnFX(I9fZ z^xg4eb^R=`D~qHEd%}GN4WE_3&*~MhsPC=GN1krksSurVSeQ3s&1VV8C-d2bHP0O- z%(@o-O9R!SSg0jq;NC2ki2{*jXlHia0DC!je=n!$N!aBH(wrhO3E4wxN8L?_Crl3` zlPhZ+JVZi88xY%Lnr27=#-Tvx8K1uEetges-++&P{Ex62nXr@r)6DaTDl@m2OTpK_ z@@d;~#y^Rv$RXP^f*mL2WfypcqEss`TjxAjhXMT>EUyauTZp z+x-E=Hf4YvDZY@e5Qn%fW|{ayIhc@^AWGW2+GcCRpYx8bxR%yr*{F)#;-xEHLtaWj zohol&9|q_I;vGf|;{nPrVmP=Q>#Ls)T>X5M%Wgu!7WKm8kcpqggm9Z+<#G-)vMsZ! z;JI|K9=5wdjV|wJ!aAe?FbpHG-C$dR;f9xBIJn%l`)YKIlc;v4PCCAmK(cHA7d`2Z zaQk8LGCvNuDXV!p!uGMdaQxeE#&C22qBHdfJTJ+?sFkD-oCMs-;`Eqa(CvD+t0GKK z`q)u5d5RsIP}Y}eDj2W15tqE^RTxfO9)l~fRZ7Yyy1LCUxIjeUA0Z=c+`JMh?lgx@ zOZLOU8D@6QCS_F>bL9>X(JiK<$AE`_AIBg6d93sTh5>+10NB>VXH<eKq3RnGyk-G$7 zcPtD7Y`0r{_*3`bh0lFDKId7tkc`0x-6YWO1K>n!2*dKWT}w{1Ga1b0SFb~@zPN4Cbrz3NtKw4M;b!$O$h`xC>hj zc^Nx8T+OS0w@yXml{>o@$=y5Xk!VlxDHrR6P>Bo&2Ympy(5Z0SF*~EcJWY7uk;m|Z z|K-hi&wDAQEc(ni!b|ibvVnf_0%IQKm-umwi)z!ZaGngOzR$Eo#to+ z^Mr?odl%fxlQvIF@&YFT&|fVDz-3&3vc_=gddRge#rnEuhkD4s?Z$rJwV-fNVFNOS zpkQF1)>a64U&IU))0^1_R+usA1gr;4cfAku$9@9k=pG!NdnhRL@6#)6HA~n?^GrQy z4h~#LqaeNUvbq*WFr8aM6CY*e#ae+lq7wt?u8i7i^KN#}gPpcA@=U*XoVkEqP`4G+ zB!CPURtGq^^d_8q_Sd7l@NYmq=T8BruERV7bz=8!5L*$3K&2R+R)*EKw5y%5R(AT; zM4-we2?Yg;8Ctif_kR?4@-|G{^S-So?18vE#q`b~NrAACg%227u7nmPlR)lBa2a)!8F*}?&UM))%9wBCPqAoE zmw8%xRsTUZmDs>4UZCR2Ifn?j=ga(xm8}DSdTGR6yaI+Vy3Uw*?8pr0mTOK{FEQFohP&TCvF0+{d&lWXP}G+yl4c}11VO= z>>PCL{DVzM3gzIFAC$A2OnfPmW#`grvUE(T#MA?*OJa84Q^%HavwLnoEP8u)Z<1s* zBI%3w3H>f6YXf0zH-PPS!WEaCz;}GxH{efw?UzAi#p5(uISEh(h|PW%QQUw3L-_t5 z`FVW&5AWcSD^*ODM!rsK zqsMJgBMpc&NzkB-nTMa@x5x}6$`rl5+qr)r>Q_G?x4N6NqPK;5T~oFN&Sy?wG5K(r zH9WD%5X|m6`N}+YAn46>TYKg9)RWm&DOnh_3Q2xZ7<@)dd&#O4&o1kpjtsq6=m?p4 z%7iTHp1Gr4*b8cmT8tFY_4X+eH?Zy-#j)rUdxRZ7166hlde5FI?=mcf=%E*fG#esD zWe1wl=cm8-(xb5X6IFNF$aW1BLQxh~Jyl>ja-SpYriZtTJOA(rl9&8tFr=Nhs4hDa zB;oBnz*fEYp~}z^mMUx-;Ox+vogsFg?W2+FSv0rfljhhf1@mlMNEZR-?M)9tq+;%d zRT#0aoXg!Au)5%MD;9;m4|47cMl`9GJ-sul-WN0#_Z3`T*2PXiofT89SdAlw0-QPX z1pe#K{7<~?*WZg;XB=&gp;d5rVFL)yFBb5!ooC*BHU7!}_Z#uN=iZ9-`lNj_a6+-m zq7-ZdSOiuER@ZVp$)IKv6!s!$7pyo){Om6?^K0D|M-&l_CjPm+=-)?bt_2O@<#`cU z_F?t-XGs;N^TuSOmhoabDeHs4CQZ1dSrouTI@ypBk05qcGyQlH!*wsh>RDfojSi@D ziIv*olL%(#xl1H}F4Xe3&SQZLpgTimDHe;3ooe-h=~9XLMsD2iBT z%!yNL9JKv5Kfr`$7bKb;V`iVsagiGG(BPA(xs3wMIOZ3%u+rw@(XN zeX27jyrA61UIZA5b$A3QL%}==rb#f2YphRPh7;Gl2;=8{Gv-^r4)gj-Kvs}pgcc5x z3!43l2_EISYaZ{Wjq}csC@>UG9_Umd1sK+Xa{MSZcfK3b@o7}uVlX~g-^mVZd*ibG zd02v)&g(l_Rz85qz5)}XA;P30Nr+S(1FAbA9RM7i_^tgd-BWOagN1XDz>A67;r#mdb{ zqL|9`^%J6^l(Di1@SG1q$c z{>tg+=;){mkdO?BW)K2VB+=b~5CbNZxWo?rCD(RxlY9TT_ZQ#X{OmZv7u#{b*f`kq z4l)u5R8U1Aq@&(X@BQoF-ur#mn&bZQJY&wW*503(=Y0EJYnCxbn`4eym+_nQWh_+5 znSkmjx>oxKHs$)k_}^Ta<9h*E0I?X8~8~LAx~*hhZGr?fiSE_VIboeK!8bzx!SIl2^POHtfObjNNt%jD}h5WZF$A zUh$!id=mekfB7qT?3weLG;vPi6xK-^LjK~xBCtUTC8hHrIM<7$!b%L@2hEV|q>X8Z zSO5>GvMX!;rQk(_SCt7nibZ|Yo7g?NK(Wz78`6hPdhQXezs(_|ma*(`skhOtkNJKP zVuCn;TqE167J^SP49r6txlFa7YaL<^3cW~_PNpKq_9(HMDSQc7x#&sNM*49Y7#TG& zeQg)R?slm=Qbn?fi+6>HGAv1AmKCO*xNGa8@K~{>r|Hz_l2D6jwa61>Mu;bNQcLRi zPJG0vhGhz?*B%y}S>$u;gnBUd7~N4IxI=iUJ3C%RE6f(FKw*1&hDD1^)b|kdMxNz3 zs8_nK8#n=CpIKc78K{8KU@7lOMUZSoLn=EqCnBT}ip}SiHPI?xrX>WYmr&P;u@GaU z2Et!-Qme4!ehLLscDi zk+aIPxC&05bZ&%H#FK1;tPeIC;#hV28l$!vJ{ABw)X%;R_{=Y(Y#+h)>Qe;ex~1Ad%UFsW zkWQD0q*l3}E&Nxgtdjdra3BRaoyaS+J&C{ZFIL_cv0aB;&t)jEq7`h=G2-@I$1oVi z!7vn_&vpamUB$RLjZ?RL0mc`73(AYW4z=uKH^qQO!KLu%yCpa=ll!Nx7hF9yPTv%0 zFf(C#;LqTf@5a14==(yX-=s*iNrhTRk6?1ELS;Bm^Z=kD!F8f6oi{mbmD_TwSIpb1 zm>&2nY?@eeoP|y{waGy5P#bJ^$-A9w^>k_GjJ_BHygK$iLVCfYpC3pgid!r843FB{m6pO3P4Glqeyricl~fAMj3G?9tn4ftUrib5z>5;c%Qy<1=vqdR0i|8`l*zRwdoF&!W zkF}9o`Dawx882`f;NuzKmRAC|y#_X%MX^1=2qEmVqpBO#1Qg;pfb_5pxD=McQe2iv zk2a|7dV7OsnR}QR@s1z&P9fd|J5(}+8~ujjQgovwY#!xf+95!m4I>Zk_zZl>7rX%f z_#gZLKJW8hh%)YBnkUTjj8R`T8pjb{XUy9j{^;HB$G`ZQ*W;NB7g6UK^IS1a6A+V_ zh!yY56XU-`;KEvYzBhrt@&P=4YpyT_ zmk^y1 zcq*Xrn+aQ?7$9H;}5j7H8J=bS=sW{oOn>B;q^Xsp=kN?`RSt zQ-Zq4ze`Y=#6L4aCmrcYh-WW2|n7$@t z86wZ0quv7IIH3{cnvB29auR+KI>1C>PtKv$m-q<>x*0z)&<5qtZ3Ito?Ye-JmOFy32;4+O3#%ahc5bgzz<3^m;3GG#b zhUf%xqPKGVrFtu)(NURq9N6uRBfM6;<4-<}pZxjX$K@+mP^T^C9k(P;y9o|pH|;Q2 z;MCp*fA?>^4uAFAUybW;yaD4lVwxrtKDy6bg&G{Q zR?>W~uz7-w1FTHge)27-pZN{U2M=L;cpifs+HS)f82dzGZUPR#hqV3AT^C|CE+?BF zybO!9b}Sbv((RUZ-Vh&67BIIi>QZ%NHUOaRLa7W>oiR-_S5Ki`5IXV_PW9}DS`EW+ z3a4-X3m9JTS{$Bv9=sNq4VnW<-xF zC+5R*Fs*n)`W^ow)B-s=Bre-g2gjMz50!H^hG2U&$-q+^uQM+uGXTDWO$YENAD~{< zS(ivcgWbxb6Ka#Jm~{}BZYw+nCi-OyVx{~~Ey_zWF&qE`l{cGLO{|mwHf>RNSNRz) zvR5?5KZ_X!AtrTL@dz~G4d?J>f}S|i;c$UdJ5^;d@l9N7(>C{kRkLH-L19K4>Xj1-Hc;;d9HCzPBzBLz6}t!CjOp?BV&hL>+~?## zowyB(cd(F7?kaF#Ag{cNes|1MMMc4|w+9EX+g8-N2j71ohUb1K%GnoV+&_!Cax&54 z2pcME(WDSp%)88>9ak{wEg6#72(eOPQ&a6?h>4JB1mQ7BXFbM*M*cC0(xeDfi{Qm$ z)F1zP0+KEmx9>+;`TT8%qw~|KaN5c`SG?*KUx5GNzxiIAz2OFwGGf%Rno`&gTBXeE zJmVLB>n-@X-+BvNcj&lwe6eQH1WP~u(mY7a!g7AL79q!AfqpwmQCKnRXfmj4 zg+`-z6S2)Ww@PTF170+JPL!qKLN@V>JPg)OWx=Xn)coE}8N*fQa%HSBP!z z5|`O&C^~UHS9B^p@HxfAxuyjw>E#$lH1J`?G{`yiSpI7V!wFTb%Zd#-sA?v!fy8rk z=!>$6@9}s7?8dYOPZSTFl<+x%1{td&9v#XFA&ikIP_^sKi3<%j^DMa$S|0f&FV)eC z<$nR7rFR`RAr|(j7YMCREBc=!G)}HF3x~K62jCt@gSN_5ZUL(%!(6zX_~_^WpS}Mf z{L`QOE!=bO!x%ROHt;5YhhwuT@H)|v91Q>2Uw$RN?=OEN&YU`fp^TX3nYt`*c+lm4 z)gvzGO}%=A#@c??c`1eNBDQd11S5lwj9$Wt5V0Ig_sE>P%P7e(Xh0WTD|3R}vdwAo z?TNi75|0+RM=<8IaJ9VWkA^^~{04Y~P#tC?HfQgEJ?pEmciR_WcE>d9LZOkKz8M`} zK+dc-WxI#XjEe&46kz?W+NHNE+!iuUQF;@H%N2xB5}Mi zon?SK2jjJJb!W5z<6x-TO1;^f#dzzNV0`XZV;;|7+SazMJdR9eH^dC6L#$YGAYiWT z_Udklv*hlMG9O{S_r0j+@4|L_g)3s=6ov|c`oig-Zo`BA7@jQ#b9z!Q*BIm)2st!? zR0>aaOciySFkN^W)6Qg1fnU4}S3muBl(It^bu2(dO6?9lZE8lOg9QS#cq9aghX|BSZ**z`fS;zEncoWR z%uTTCUkD6m8voZzBZjHhWy zbiThDCn(^38$KL;q9?Nt)DhM%|DZ8}3~*scHIhGJ0Ad9g)Hm`&Wn4b=qHhz;nXj4G z$`5r5j+HzjUkg!Zn)J{vH-ph$mxAqf$4S|7#9#h~uf*T~+uwuhZ@dvh88OcjcDo5M zV6z!v!vMJB>g5Cc^e?;#Z+^$0VY}U7t}}Miq=^~fSiSAeS+TU!ymDX}AAIZWoLba5 zm4kz_i=9~p_6x|eOgs(y9A%j<;JkwW`sMvEowo;v7B85!XqJJxpRy^OFP!nPI_G?EI=(nUyNw%&kbRblOglV z^t`}5rN=`q1LR|$O3-`jV_F+r;?P6lr$PNo3eLEAUZfoZnIqy>msO$ueDdH&SST(s zWTE$9h(^@4G}GC@=`FEPWqO0{q1VOVjJ>+2$dLS6rY2^s!LA?yInS|_6vPkZ6}14M zm6C)EmONc5M}*W`PDnTQs|n09Q=jEbaq9@ESS~8`NXnwcwsfQI2YObeEi+SQDPs%y zC2~c@OwSEJ%W;X1l-5$+4fJx=F@D=q)AwUdxd)-&aOq$=;YR&5YknPE+wa^tKpD#b z8-d54cpCrgCw~JU`S@KJtYV&dczD!S=Q>X);L+``f91>YU;ofw!tJ-;ip?-$o+b_? zVccpsYtjZ>O^!iIL!1b#1k?>q>yR41QrR5B_Iso$-I&;-mA4gWx~Z4EIv4q(XvRTR zEG)@!lon-{F!&H6%AkY9=3q5`h+l00#m+kh`fY@p?gSu6e!7Sb-3FW6UV-t&--tS# zBFv&&+k@yiFcO3Uo>h;wR`o1rJc{|wd8r+EF;(47@NtCATkJmcTfl>Vi0Sep*dAQK zPzq2=JCjZjoD_&15H9=cgP0=c)ig+fRXNBN#Ei}#R~k66;ovH!8?&`Z6Oey&5GkFI zMVE%`Gvd40rG1loC*hTfE~X%KWBvs6yt!4bfBuQfHKk1L@MVmaYtBaeTHCz`VnJbcF*W5CC^6sIaP_b}j9NMTIhFF^R$Wq(!D9 zFHM)Y1loD0L9{*zIqj|jM^C~ZcsGW_Cs@Wq2iRY-T1^fYzzTPQ^xYz=TkWT6AnA~7zpM&v+7od#$Jf9w`s?9Wu8ER*tThZ@C=>C*; z%mkAcn8$Nwwtj>0nLr4z^#OCh3Cj{jim`pL-8D@7CDOvI%c<*=@nTLms#V>G;W|d8 z$t}rbC^IlUf$5p|V0!#*IJ)O8uuGrBW^)L~5wWWV-_828oT1Lq1|_kuO|DNd*2*0h zv%{xZS8No_I0L`wFJgT5H(+!6HaIqzD|uhaz;DxQf}-iSCNkZGbJYMqJTNoBG&m3Y zvyv2=SQ>-GXRRP-oosEk>q7*_FlS4Z=-T@tq5t#=M6pbhp$;v6v|T7{+dc#1X2iJ1 zi(Jp1+Q;Ai-q+%Lzw5P_Y~ZoEIX;ie9ZmDZ3GqiBeG32IfBCEU)Lr*uf4{H~aworB z%t(Q6$@(_^>Zv&xLJ1dMX-n;8^qis^ADUkh?S#)vCTxy8gMoT%6N?>AWN+_LAkvzn z#6P#W*%1Uj36*-Qj9ql$T;ct;U1(Si!Xy~``x5a59Z<&c97Hc8|%+^;&NadXw8`VyD zZ8G6=g@&^T)Lm5zoEQ>f>)#wSBi}=Co(+d7nOPFNiW~=-wM6gh(Ao(zdi&GU7Y|vO z5l+$!h0a*yp0x|Ty>}Sx5{+wujf5n`YX~e?%TgVvgY`yC%eUw#sM8VC@}~3_Ea=KI ziszLqT)b36Zxne?%X$0j$#gPAS`eb&;ElIGqFu!0xJ=lBNWBDICv+kU9g29pEJ3mJ zV@JY7xA0;W5uHIJm!9`LPdGfdil6?4H{y4H|J@jTZbt*=Y2xSp>IA^yHsVWO_9FbF zzw_OA-W|`vP)53RrSKN(VstzPemB0F9Dv3g{mtxabjnE$_Qk)?C7-YpD|jin|K>a` zp<}SDZe3@F9QwViZC!#?Emt{2X0MCcdZG}Z3Tb(`9i>oVL2fmwd33#Fyn$!T>JI!Y z()D+s-2O_8&w4qXL=32vTg3^ULmmKf0?`H`0Cj~EcO2N7aCbR~a84pvF^qeLIt-W( zE}(wsSAYlp0QK;3Y>zIm4-b-rXS;w<9Y;8FNG2_taSpQ8IlA~JN2aah$wA{Y;|W`h zKURubSCaAz6Rui2hH=C=a0Tgb+Tzit&*8lv`83{j=O=Lg!;fN~ClmvQ&4}t1b>iLj zW|fZQJY(GKWB-P!#5%GMBf;$0SB9vLu%Gg7zM-TTL= z7w^aJ=rRmiZFlG8dd)6cj97YC?c@!26iGS;l&VXZG||n!Q8y=<3UsMqVSBH2hv}&Y zF&|t4Ogl7W^xI^64xtR-5ennDBce#VHK}NIJvnJuE`*zo&sf44ny^8gVFy=W;Dv<>Pv}GV<9wG5K%h+=o@$0>KxPifAay%;NH8Ci)$;2UrTKOhjgPIY5Y5J|T|44JB zRo-X?#AvQF+$XqSMLoP9)02M$d+Lu+AAT3cqlYl=?NG*vmt)q-nME5=qpm`x6QU-{ zz=;A*yzyW431tK)Glo5kw|p_|w$}msx1-pA;sbfD2_2YhIneF5E-q|+Eld|k20xiU z|Ai)sqq}U`dY2{4txcUpw7V`$jBWY~5zjWqx*MCBgZ~Q!=20f~Lrt1dk+N~pwYFnz zsLmZgx&U{YCb$*ca@|?{qaXdt_@;08YS?BEWpHed4tXr63>ZqmwB5nH;xl(Wi2wcH z{uUm7^hx+!G0kzTNqszcTqC&9=@6q<)b;otNWnT^x44PoMIE$?Jtgd&q4#IahmOJl zVbOSnanl8bHQETlu+ByM%lRTNPWV+m{zRH$)^$a2riIG%_@pN$+SOlllb$%&A_K_` zEQM7a%pMgg|H4rG~Tyt-DnEd*oSQ*5Bi^ zt~m&1??-~2>&g@a-~>p=L&HbBX`6FbIFrfCm=ocrGau-zghMiljwESRkl`%Oa(b~~ z?lE%XO$rKI=7?9%cqYu^u@zYpvwl}pQ#6Q<_S6R59g`)DUS&cm_z|$wZ|0DzT~SFW zE0loLX3(pOY>{N?-?5O4dv?-V9HJmiA+nmU>T|{QdOEyFTZEMk0i8VnniFVZ24Rqr zbvc$ffhmq;P?>JZ5*tbRTR^nI$$zVZ9#HElxHKQD>tXPp19jx04^seez`~xd8 zKprg3qZ@!xTd|c#0k%UGsgW5{K`|<-T8|skG%u+@F~pG6%64>TVkB_*Nr}8 z3=|uWM889hsFQFHhG?g(o62h7*|xK5`#)d19nXUE_D9k!MQ6|{&#CV4=6BzT|NB4r zxA^b>r+6(|+sSTWcE%F#X8KJive5B(929(peZ ze-fKB6%Gy}iza1!svJ-UJInwpy1ibJ9&>cE!EW4nWCce@4(vY<;~n3O@y1tR*jx|C zK%G|0?K0AihJkVJ(Z)$f*nBYq(CTONpp5b*oMbmUgd_(~Jnyhj(Cu`z{Sag5Eln&e z7OJJRsSE9RJ8fj{gG0xmK_5-F+D_beVDwSOal|kb4C4kbe9p7*|NOE43}5s`FT=2R z3j6yb#(`~i7z}$Gex4I%_``R65dZo=z5%mpb$cgCmX{^}YiwT@O(}FfF33^LH^w1QwGzEm#mq-C*2t{m4>ck{VK1 zhXh-{Nf(y&=G;*y|Fym%8@px2i8Nnl(4Oh55$;Jv3Jw(>_}L^m<>Z`bvdDLv*IBbCj9WG! z^`8x{eu#E&QESD^uY`RPQ743e-)PE78hEVP5ii*XB0Ct4F(GSmszc@1yx?<>Y4&VI zLTgwlTubR2j7UixY%7wPs>d}hJxvHLtw*mzj9~|-Y>PAveBjg~eW!SLIAPju@xf2t zh5z+m{{}9eyMS@v1#vdS_nr+$M@MiJoIZO7Kl%gTj&J_@ufqP`Sr`VLb=4}9_*84f zT+_^Qc!m&u!ncvS_+2nVZ!5Y15_!V1*ou3M$SY$R)PhIyJC6ZiXku8$<&eu-2qI>0 zduIUzPdZ!T!Q+b`sUK}wL_=gZ{!xbHWH=;`I18y8sl8xx-EAm$yb{B$pD!3RuPFM} zXtL<+6;+B3d^h@#8^S%7=32+{82~4m3Jhfc$}n>k^57{7`yK)+KMlx|8gQ6lo*eUB zF`Pb)&5d^ewh=9TV8~T#*PFIxw=_<)w1HN{D}&FDS#7cS7WMx30*8-bnhuybCNT(^ zwdfpa6RP-JoLi0CU2loMtfcoy?VcS}M%9*gbML=2?!qMK|7UVNmNqL(?z* zEsc1UGvZ9W?FHIEKztzx>N|1b8EBZH4AQE@t1;EUJjs}w?4@3!8MpV8v9m6Yn}m*< zc14A3v&wLtXGoaRqfGdx+(Cv3Q;bK@Ec?b-meTuK` zuaK(2XTdR$muAA%oI-T~!w9z#ICUGw8()M{Hf)bW*a%8;sW{8Jo8UB%&unYK<4%PlyL`O;zUd3x&6Tkyzpq&!p<2`wROe7$x8#b)Vq#!xQ&2~ z824`jZu=(q*{{Sfo`LyDSZ46Tm3Fg2d!Ytq;#IIsT?9kpbw7#~?+lE))+LU?Z&}Y^ zRLkn13_}{tZiSdvPG+-wl2PV88dmvlBy~6j**w`W_Jcst#B7}_cDot18ou-kUxE%Nry1L$Eq>|s@5Zmc;oX?$8N1ztdADo!DW;cPsH~}4 zh9nIA>s;-6+wzLTy@WSTxkM2?55P$)+W2TYOKj9wT6D9aC-_yza9^O63}NsZitm{k zu05?)y!_R(BXmZ;#su=3vc@`b9dXnyqGAnVkb4Yw;~)J1Qj>))F6s(w!^oT*mQ=5T zi)yy1Xbe5^IB^ZDH8z=(EiC1rR^SP6R^(t>I~PJO9YY~vju|!PUxrkAmDFdRBQ3+} z2@CWjP!>Io*&?{;Tk}CHWUT`T2Qey=erK7s=ivRCOob)pJ*F4Q#-WGYk1V*ju6NOC zMNo+(O4A<;HYAzlB8#wK!cs3fU5X6AsaUMU^IeVN1bo+Oi-78oBe1Nmam=td1DR=c z;b_HB3*Zw6=;JWJQ1RH~Pvf8c)NkV6`yatrfO(!#r^=3UGh(})QHBkC*u!^x^DFTq z-}gG4IeiLqbxboqVMINtTrVu@c;FaxD>rc?R@ASKTyAoWVTlpPxs*aM=g$inNXW<2 z1gwMj$=hoXlbnxf=c-y?$BCBkTf3)|h+V+wUXBN!x_I?W#Fay@>J0TQ^@gTyJ&t!S zxEso_54-VY7+>@nOtz1?>YOQflRO{f1kQcCuS2)ZgS0qwW*EwE4h$MFx^rS-S5bF! zyS!>X{}ARoe*yNy`!HR840XDU!N8SqkUo;+9E|8&&f#3~T&G+^*{R}agCCey%=8(r z(k66**P^pJpOYx)%rn18ph}3xX1qcEvkyIiyY77m+ue-Aony8EhtrHteEME|>=Sos zC7t!OlN%m`1z%_96_OKm1WGT48UlW(h|_Jf2v;Lk?Jzzv`XBDbRfsM&?aNThxO~@TVWc zuo>W}oa9kIZcQGlIrtPZOk#`RC2(=J0Hp=Dc+pvRpkc9HneEC7kGdEPK09`oFQCpl z-2)(@x6V*VAO>N93K0z+u0Jn{paIc`asq<-z-`vGan41>e{5PtqH9DVj3!1gN2 zFk=`Bs_sl6f5fLYBNCxiws_^E?sT96qj*d>NWRXa5aI3f191SnVxB4-BZeEEkKy{~ z0X7O~;{w_0(LfYb7x~$v8=7GP7a`?sWt3|je~jPaM*~58T2u4bJ}-$GAnG-V=p5uX zp+>vYMY-D1;b8w&;lNC@RO<|2Mky0YeH!z{KSO=&O_(2k4{+hr*w`g(HkI?KH7-@; zJszC%V_n^sqLx`f+ihiq16A%+8BoRz>SUPf9?ETh5#w#I#dzIwfnl$kdP8VUYfz?E zQ$ZYBawx0#%_{;VB*7yOk_fy{_V=>lTcaX)$+n876>5LEcm?&_lX4hnD*_KyZlE0s z6!Tx!DH{}z&fQlq(9%f0;d7KSpp5)%>#4nceCKPv9Dna`eiu%ixsIRub6(UsZ70-u zMgcII;qv86_~$?Udc608pWuY?kO&fS?8ACA18vQ*=%%sMPHCuknwgbzF}3-xYQHWN zV)ED(sh*GQX)YFJ1c+e)N)zG>0!~5$o%y+K_pG6m3DN>i*tbOv@J&JzKaD~JES}lc z&4qgd%!${gqS@x8zHS|Q>2+)zPdp*4c-iR2Do&g- zE{l>~Mrct7WgR4Qgpzw=bws4loxWvQ;Ibpe@=eV9Js~7SI`)ry28fgbNqW z<6r)V*W;ak@?jJMjf_({{B9O{j+%0SHA*(_iubVu0M4eW&@^q;`Z>u zE#zh+JFmECO9Pzja3Gut+U`KSvqQ?|=*VA_RR+1*X+R2e&!9RoJ)(KX)It z@B3-kQ-6lt<;O5hmjD3s?ArP*N6iY47_?9HEP3v#-#sp2l5-emx{>84XCd^?nArL{ zi#*)c8=vuuqA-rYFJHZi4}JV@TsU_g!#H5v+k@GF-AqUE;?=8tl|4Xs<*HfXQ5jTV z*uM^C*hof@9w>YJ7xHB==t~VQ;BxZX#X19b>#(W<+g--|(EH%qr%-(d$VHqhz*DM> z;1=0%9@ENqXpu(>xVy&zfS-1CFUb^2&jXYo&U|KE|6~4BNYjcD-q;Kr|+V^BQ(hIA%F3B(umsK;)a=4QO{H zKxzT00~2#umhWr#F3$q=3n%a({7DR(N?F>are0T&aj$t|b^g_KhD{vnH-=Lg+ z3CeBXjB@I^Fgq=v+OuV1mIiU;D`_y-*%CBhP-_{w52b^S?=NVJ2I5m#=f$#hp zeD_~@Eyn$`7)IXLQ3md4Fn#%D-c5Mm;m7dLf95~o@u!~woIcgG+hU$(-gThkQb4Dt z5A*}M;8fS#-qIL)T9c0A6RYGCAp2Fp1_MksjDLa~!HDqT+H&zD)KcZ!GXj2p4n2@5UIpb%MG|%?-n#8P*>H9K7*@uO z^sIef(CTy|5V+^gtz{-pK>OclY8;C4D!v9G?7BWIO7Yq91Y|^}+Lh*Oelu3EJ3kk& zSI^>9ij5F>EwS(Qg;k5Pu0P68L!WBQ6t(zO#gR8)L<0i)z(0b{s*;-vBpBE7E(yq0 zE>Z%g6uBx1s5t*EkV%YU%2F`i8$)W45dvm6G5kILmpsuBVi~f6K%M?EcB~A`;#ZkF z5T>jY2-o1tqOq^@#7lxrxN9m>srK0OG{tsiXhtZ}6_Vg3GrdvL{3On$?Z|5^2w)wV zIkn^fed5qXcIKVbs3aylv?{CkIyxr@jH&2o z(`wmpHa?NSW_WTC{~ZM6@nXS)VPZQSEH9{Fm7d!+kdUn(UcQ9SJxLJDy$gnnR_sQ@MlpjegeDg z1$aH=ws{8~Ef`@8Xg9UH$9X$$L4OG4KM#dEz$Gt5*(j`SO9j3C<%n{DwOnSQ8`5U>NpJapDYA00(av zH<1*!g{=}g*Qu`nXrRKfLe2&l3Z^Y!8-wjr2GgS-$Nc0+u{*rdT+d#N1443$6E6l{ z8VTdd8BKd_10X}BIdK}Gm3^lB3>Yd(ap2;kDAN{(foI2q|Dr4KprgkXK#6+Q=W!6c zXrr=kNbVHR@-GbrWdIIbbY_@eZE(z2E~8Fc9$#s;NfoSYI>3n$%7c31>y^>=M@nUK z932{*IOdrv!DVz9X4HBKM~{2}NB8^*228NQQHBZ_CwtoW-%S^RHZ0Roklr0ExaR0x zB_&HcY;nW};F)t}G!)%{&OF$^5#`p;2gd8=6S1%FQVh;?`$sBc=S6TRWz0AxIpq-W z5KI;7V1mqw_Depp$wGkxWOH_ z-GqPmxBd#g>Z`sKWpfGzz_=;x$c~v|9QgicAO19c{NMf-E?mB%LB}2$U zA&`$9OG2sT&?MBFB{8W$-3pxyo=_hG{RLJ;Kv0r(TIl~Otk69baS(-XNEU_da9Um#>F~yX;upn=hE#s78)l_?) z9+nubg5%`;idwL?T^N!pGO$QknS}Tft`Zs(;$M!x7LqDt?N7>jtfD2DlutT-EPDi3 zlBa(?b5|&9ioSx?o)ZEK`j%m#pt-@Up4+b`nOo9H^kn0AB0rOrSsV346b(WT-Lc3a z-lJn%*RQm7Os1**242#snEO$uw<1zm8D|DcWSOP&=UPFiH4K9v$I5gXj-|^`L{v0Z z(x};fGtAQt({93ac!c+V^wank|NeJzba(`_iZTo+Hc33IENTRFr%rfWif(fDjbSSJbC{rgYR!tm{XWh}H zM5e463IKiE-@-vu==QjAu&13=A|hhJC5i=^{h?<_uf49mMKPoo**j@+cr#YgHI_J` z$5uONGx1;G4lu_x^tiKlf1_Tz(RBtWsAxJGFAlc|+WI(|nLb zxp1N(2;>BSRyrZU2HtsvkJ*KLj8ozmLNs_POyn=6;F${-ao+=vVxGDJ%+*l}C(RCz zcEZ1M3%8uv*b@VA!0bLsc_a(7hhw`J}kaaK!(L25225499$S>Vg;C{Lrf3dgL!+@ zSN>bS%=+4pLL?TR?pVNe*N&5rYYURis%^#~rL{NH<%{6^P;~5~I_9fa0O?$y7n5Gr zl%qqo(3O-FqA{q+i9SAe2h=oh;Es)oT4(I0EAT6iV7~wD7!RHRN`=o`)R~`etMkON z*5;7-PZT#B5tVpfsb;kFFZ%14Sd$I(0@V1#XOSHjHPdXcGq+*5?s+KVX|?TcXRHw~ zhg4M}CKn>2B}7Q_iigHGy(TqD(G6Brn{352f!4@|^?Hn7q2aS>EkEoD^H8-kIF^nD zmfYoH;51&KVR+WpV7}p%u>G5PG(!Sj^atQOEHN?aLdY)UNPcm) zBW)qcb|MKi{7$p}I^@ju)9JE(#TFe`|rY4e=xs`87w)i#9O#!4Vip#Td8IeW- z^9DN%g?FnsuszxVUhuqU-H8A0Z~qm1-iuyJ|Lz@4XAZ z@dxkL(F6|Z>ol>xfwq}EAP&;HkWg>W?XPsSb3lZL4P*&{YknU|?XqeuEqtDpJrnVf zJ@G8sj(!77yfl6aZxPmUZH#3IUnK6uY5jGlt@$bWr%m1mwWPn9sfK*QJ@rjtiz2Hc zyZ_h`PU-P#osP&KePm-n25^F11Jrg?1hB+AN?Q0V;#G@JM-zcwR(2Pm5-GXi*43q3 zM@@P$1dN1_epl=`9)w#B$4ahHp#q4G#)H))M57Pt1Unom zSG=55VG81%MZQJe1QcuMY8jdXkO2r@bJ&+2fHLLQz>e$~oK~&T!Ona@BluXWa!as1 zRi%H;2paP@m?>|D*g}eo?2ROqO~}!Kq&IQAymOTzDCfY4PR6vGP^)8qe;)?mktd(V zKmFIgiTfXT7(hwNNo!-aa{K4t6K=l(Aqa19rP3q86*f(4?Gk zCjfU7YwLg0wTy4bgK>0f<-DH2q$Is4L0xExIR|L$6vdxlCN%3G4zmj6=M`=(#H*+0 z{M&4f?2qD>)vS4vt6_Z8M}Ya9zX3Do=WEyp7K+XZKr+xOClKy4owmyJkK=7$i1MP> zVIIx^D7u-v0w~ z7`FFep3cF1i*e*OZYvt_!?^MhwzR7L!WBI7DF(j5GwFW}J{!-(BFV=fo6-g{K~X9v z#J$eA=fTJE^fMPxV{35Xx1&qpg_+~th@p(Cgw9A@#lVi2jPzmPQljvwO-P{w$%X*% zN~e&QlF{+DqR+@_4vEJuj9cBSW7r>1hKlX|??*lVS-5YT>;MWiCQn$6p;S$xIJ81X zZ<;G;Jq;$A3vIMjR73R{^U(pekKYUE$UtzntE5Xt{YtUW{h+@VaEoHYFxpkTQ(DU& zm3F-t&tAvoz1Y>@4wzNgIKa1u@a>Tt_q5C)+M`~zEMAP*5Ns&)GI~U;s#L+8x zR*C^WVLrNq?Sp>|JoXW8{r3rj4e+h&_W!~i7Bx}npdx7p24xfcB|c4GP4xoZJ_T)Z zHp$A)M?(x)M%c|Sz;MHJVK$;x0Tv4ytpPjnB36|VHe(SI!xm``Q---ewi2%OQl}k< z*b#k4alo`K-6SJ#xawj{?Q(&*7kGzA$)GrguR3}BAH!f6ONG^Qu!E1IKKc9DJ@6)! zg9mYH+@cHW$D#vtT1382jiL3pzz9tuH%oA#La9;^@Lku)SmCHJQuy6j_t#6h_;cW_%$ zFvJuN$QBiDp>e5Ku74JBPz8uVqMjQKS*|I~Vz}vEW2j*`-&hwMI#Y+CFehj}SOF z5>x-yyFSsA%j-Gi?eVO%s}LVj)t!T)y$7|4NYbB1Q#6@gfawc^mU09i7miM(FC_`V z=YxDgzBK%)Gr{Xbd(gS^A%kZNRv2sSiDY0)a%?WNumoyLfcLJ@xw zVoQGHw>788qY_ngB=r#a7YM~mLjGC=F6!2ns0J%qN)%oqzpU~&5u`Vylfvq?1@`3Y zNCXDC+_7veoCJKyk7K2YXiC#_L|MnHaiOIxYg}|DEtue@gf&X>sB9f(syN3rIpxY& zH;oeu#NVi$|9SrsWxeJGue_`d zX1qXa=FyaK!*lD?z3;=(`+geJ(;vt7;Azx)0Cyf&;m65HPtoTE&H7-hRTqsC z`HxsChc|`@&tQ-GZtyoI`I_E4x6l{kZWO>VU%d+79rjhvHaJW+q{)Uq3(~Vp8uAQA zaLtK}_E^l|zQeS=ht{isiOi@hLZI91 zW9lOmnr?^jAUOWUwMTo`VYvBuz~-#3U`h?B-9xbI>s>tbZhx{FTI3DBXh23hlT)5( z>c!MHW8$uHLV2Q$rGa+>O26ap9g#P zYhY(zg0eZS@7jrlsUIjnCa5#H(VP64rtwNkZ<)8IVS5kpob&f*QrN9({G}#!4lh8a zhztpe&RI_kmd+J|WcT(*9ywBa<3BjrrtR|6Zo*Iu`+NKNj<5f6eE)a77Q@~i%#1tQ z0L;4yWhf})h&s=B;K4`n<3IDC@X(`A0dvJPRUA!Q)Y@)a0c1@h5Ut>FLn`ICRyaux zXb=Il|1`ndlDtj7XjfHYY%DmiW9dGL`ckxs3?4`0qslA2l}&iHyow5cr@t@%^^nS~ zGl-VRV(}-tNhG1;2C$InSD7OPu*Fcl$EVPgNI$vZrFx>*3Pc&5U}qS?-=3XuE%(VG z%F-V57f3KNHKs~KL~G(K_pPEa9W^|beSuu)MT|)J+_I#+F+sG1m*3Vk5jVLbK_fZD zzX~F_F)pY~0$wtM1oog*%^*h|5!xBsM6N30zn)cL8R3?q*8W24$dfWD^sWdCoEF)7 zhE7J-FkjIdeNQH_HC#O>T!ARBA`NE8>T`#VbIThzq#UM9t*x$u0YI#x2ERJt;SRLU zC1Dn@;b3`Z&K7M!m_nxCS5_q@A&TYgQt=Oo=w=&}!OTDwG^c@J*eb znP@6J+X^_Q-3-jYSOCB0-M~kG4&~?p%=1;0QZWv^uRy>7R8(!9g>$ufAq>;K0IZ&q z1z~tC&ht_T1~hrKO#&b-O*GJpU{7_z{SQBm3SbyV)Vadluo=0UzuAl!25!UW+1Xf~ z4SDikmx%0Fpj_C#nO|jM`#?msc4UATl$pCEP;E=Xb_ohS4S*-uI{QE04gT zE$`MZAEP~W?j}>xf1%!eJOFAipCG29C#(Z>$>6yo|d-@4Y9rVwwdHe>@;6ozW zwe?s~Whzvm5fMl1Mo_ylokK?KK;o{ExRlam_sMR44WRChFdtm*{0+PsHkrmGgBBmm z2wbC4Fpcd(<>KzvgREJ}p0N=Y2d$)c*%I2)}lvP1|ii(IqqQ7NQqS%vn z&;=+*yV4`UBMg0gc2Sp!ZVqSTKPIwNKSPqwtoIN*l1MLEBss-Jct&$orHE#Ru{g{x z!lwIx%kRN_|8HV`?0v9$1!fa$++i3T<`re&K(cBg(oJ^>I5?4_iHW`oEj26@`kplA zoV2$A^90m#J;qyKh2h4phMl?%z=-PP1LxbL4~T)c2nG1HkOdRbJdDPnX2csOQy|R3 zTR#*>!HH{O?a&~{eH_V`iM+jLy@ZUB@d!MZ$Sm=q{1zea2(XxRWN_$6hb9KXOEjau zzmHSr zHtTBW#}}Er#Hu}+A{4o%swXvr!k>6fWlst+#}8&}gdM1SRzo9ePh@-O3*dI<5=)k=oNj z>|Jh*=s2|UfnsWp$AL%4!1yY&4ynF@0_Zt1J)HUKIU#&VSL&D+6_FxuPJ*@C7CBc+ z(~QW1n&n#yDRM#LiJ6fIibp*(4QFuAZBK@z^_(dalYv~Nt4hq3B+d_6g(If@5wMK+QPZko<%dR{sX|YbL@6I+;#s$`2YR%@8IgyD;S0f z3-cK)GL_l5$e1{F~^|#=1CGL z99WoXH7Oi#s1rICqT|C#wmru(bQqLpX5=!x$>5}L5-O{rzzPqEHNsWsjV*z8{iyY(xu_na@5yasI( z4sW@y>>qE}+4v_0d0$Q7<$PQ}(%b@X@$-UV1K8j|-C?@>ojCl!zr*gr-8kA^gzNqQ zcJNyHjL*0g0KBn4D}t6ZiF^pIM*o!EruGQvnw&z!%6d+vW24u=gRw}rZ6 zmi3w4xtqp#Q&_@=p-O57p7+)2wM!PnKlM3s@P(XaDkwzLt=`N_DBO~-m2h{U8peU; z{QP~GpLjp!qbuA~VG@LsbHtB%&8X9z8_KH*iqJC)mKg`zRRcFGfM0k5IJnBA3c*AJ zhY;Oy1a3sGJQ`s@^#OL~b_~})m*1R60=BYMIjLiswc4$ptB(Pz`lMny(gIfO9+PLRiyBhl*kQMQ z67!``VtVQ=nC|&?)Mq||f~y!t?wZ3~QK!nS zan~fe2RBt$YYovd`jltm^=i*W#Il!IrG@Wm%w@7!zTh?c=EY)!T1&R8+2-WnOuR-= zTIi!<+i&P+g!IgKMM&8~=REXuRo25MJDPA~%(uvwINfpQd$#F4Isc6(y~(v9Jj&-7 zQESC+RcFSfXERAW_@)9Po;ddVDk9AyPjursJuSj;C()99pF5;V{+v>+y7os8Vp%|F zxPrK~kRCI47VTFdHv07n^lqt=r4lPHo*P}qfin)I%7faGIfdV=JT#1EXnjTEPr&P208N z7NNOKfW=wXNKtTgYT$N$6s`(PyBWJ_#yAcb2gCV`m+&wD{Tp!4eUHJa<7hhrK43bi zm?neyh|{NU#dT+I#t;4H-+{0A(l11HLn#|I#X zFz9?Fk2aRx!Oqga>TuVZsF3#dhti8jYw_z4Tx~;vW*l37f@)#W@#V01O_fEba;*?) zLNYttQFn7f1GjMEqf<*>SIf2v>o~%f%WG`wrY)WhDla=&>pi0yvDNtGSb`f3T)Jmv zgU!t^#qi?Spl+_i?1s7W3^pK}2*@Fc4nTz&rs4jDCcpd)|fl%0sBwqJ-XR(9#s7NROZ$ zMpf{mnMt2*cJ2;<@xs8ED}tj=Tg*>A4BsA!d!awFjSfJcb~LD+hRQ}gjUQ23T4q>& z*&%{PI5B}A@PaHCZKg{ltrTFp!*ux~x7%B+Zjk>maEyr%2T;|=#ujvQ>RwE`xCV}F zBWc%*b5(gTz~=+l)yJ^A=k377#{kSQpLyor<>}P;DuDsBh6bE3YdmCoSoSqdj8bXq zY!Pq7gWh7*@l_r-i1s~fP;PnwhBME?Q1-NQK>}8FCU^~e6NxhDJ+P}`xg($0W9%Lp z-pdJmWWeNsVp^`s?V%oUJoz+cu*%&hKuiQ`H;R*9#P(U~3Ww;9(F_GUVEZ`i=+nT{ zZ$-WLcVHLqM%nBzj1vmB7+|njyQYf1Dxfc3m=C~A+X2ixci#F4eXg>`z*BdH2oZOn z&I6{p2b_KphC5z|&5bX|uy+HGHK~*3XADVS&;U?xBf=E#@zSN%hNJ)}|JKf13CWpU zr`?Epx@?3&duFQI%OXyB60SL(tBH~qDO3Sv$iNl}dP;yrLWgdO%;f{YqIT;nRLpqE z@nCQie9=o@h=1_6zX#Xfcr(T_(C0D0F=5*700W9So_gvW{>6X%J>2uqqZl^^fV;t> z&xtCdA-Hy`Ecp|N$6=+M5-mPjaSlsfg$-yl`|(mTPc6Mgwy@&wu{v|e^@r~RICKGO z1C`{_V!EA$Y&Z0;>0}D2Xk;pEA~9P;r*QzOTZX7Cy{;!F z6d0!o8Hisr==DYU1$wEREN%-1wfhL` z>a|;?hgF8wBu+vuRoB?C&exn)b{b1$BhQMU6pl6S)l+`=6%QA=TEe<47Nr*Ghm}hX zGUK~2j6bbp7=(m`8~>|xQJLF*+b(?M|PEZ{P9?}6BWS3 zpZ>;{9&yR|s^e|XGCV}P=WEp@9(QDVq1aKdMDrvZmm%k9Mop0h=g~Eu0l-}R`?C`*??)DFrM1S-u@YU=eNEZKl0bVh3EcH zokD?O@1{F&%S&I0g9q-!{+yLwMc7>lSe5_vQm%@uF|z zSqm-)61?C6p~!&=`6*8bsK+$klvYnz!bL8Hl<>JwONICtJ(G|PM>6nP|At*jji>oy z8SWA}6_3a?i>}|^Z3eKOclnEDCktL8S1YAt``5v4`$}w{_oe(CAoQJgIi^J>m}P}k z>sMnpNC(*54*#2?MAS9c1=QP08~H+ zAJ&{|4uVq`m)cK_i`|r{tc_)6$@A!JgTqnljC&q<1m`YZZkIRB&h6O_4XmtaGC*e} zWoOvIlOZm9z)SxW4eA2f)orlFZW=7NlUEnLeJv3lLjn{3mAzJecCd^9p8hQAlOMu# zaH%`Hfsp9;sHSgE5GYRYR9$M=mP@4r!A1ixZ4Ytu=>4ek#IGY1uBe%5fNKp=?H0;? zGy`=o$w4wg$Sv$a$ht8t#20wA3hCrKxGGmGFjwI4pl_v*2`_?gCN|cP8=;U5Zb)@J zIZTe@2>@azih&pZU3nDKWADTC;QO%|IYCpjuRk1RI{Acc?N2;(9SXY0j@-W{7%rQp z3&K1~XlD*%D%aGV=gsGG2II{yh7H%ZiJHcO_MAJm?jNKFnC6$ndexnDT}68VO=tnl zR>g&RCORW~+W`=4R$FsnU>?WdqcYm4g3@+-7)RdpfrKk3DQ3*|GNvo{!!Ldi^8>$u z-92wWIeHvrQ!xxP%w}M!pb>~l(Ts{!>If(4h&6ZZG$HhUya2WB_~7NNumN5-7*5}g z@wu;so&6Hn=6b-!CR-~8Oi1=2II!#|Bc=V4VaHNJcGRl=kEA8J>aE8x^gT}ukxn=n z$}-=g{>I06RcZ*l&;KU`B0@9=FD%kBw)z#XnNfdQhb)~yL7isIv*YZUv-qBG`)d5a z_q-0n{uzGGlebO+s3@gi&=-;Jx$hzT_|Lo^Pds%2^KL?Q$98wbNj_bY%1dMm4PZi} zbE!9yh9}VWz63wJ#`hyUE)8*Lkwo`iG`7Zr;?@rRViN8I9C`@Ji3YX7z^ChtXrB)YM%C5UW`s9rAk zT>9fG*fDBX@k_FSwNt?rk6=dZ0Ei5&baa*{5tSN{t(e|}YIm&Jl)?hBWjG-Uh$72G zRuPWTT9_;2u$GgAksbQrSwmfU5TFzMhRLcyv^V`^8xx`BKbF|J+A0We3*6U)q!4^) zjtKcfV-z$8c%`UMAS5}DJvjjPLBlG9!?hsC;zAIH6_&^1vTY9f7P5)ePo*0GcgOCC zpP|`oHgK=_lMj3XKl4j}h~0JqFOn)S8&Kq&y8#siU+{T%;P3tDx8k$m(P*y)>b{!@42vEThaaP_VK47>Z@irwK;sM8^K+XJ49G}A>$;Sy`b z&%t-`JJ{Cv9x^h%lhWuUBXge*U8{2uQag{dC=^Ma(2e=gWhMCfveDN8|>fm`PjVRRhaj# zL!HrAnE-a!ja6(YbKAZ~IyvkhKccPVj^13WV@4f?@to^CaXVuPD}Q(uyHCCm_3qyW zc8_7ISDHR~e2h@!^0F^_45nM~A)2k|o-F4;!YV(j)%4DYIVUpMAtv^BykVH<33os6 z2)6SK+Z5Qyt=QGM`der2zPWVykXu9Z3Zr?m$1&I_rSKDBxuTjn^$-`2tb!zRFkwoI zRp)3WfOFMeDx!rBc%3=e*h-9idAs#`yJ>dC*GgcHjK>08_`W)!!Oh&1pB^J3>o>76h(umIU z0N=X-cy^Y{@5~tzbMS4~Ropy7eZI zzL1f2A{FfxF;1)iTydw)1q#G_)_o@%0|vVcJG>8e`Tf}4_sgh{yaR(@gpCfvjCspT zKFc`puAP8c9X`hn6z$ToxJZk;1e&gg%+Q-s)dbt@hB^(Hrwz)DUxwkd^LS+hjo}`#;O(4(M2ocM;7|ODYwQeVJ z5ue_h6Li39-nYeB^PsPxsF329&^nWI`|+Sz_9e2m_-J#SJRL?(ZJgcT#}9w^*W(qh zco}@yL$LwlX2dWKsPhcKP;A7!+u@CG`4jx&>)(p90g4q2CR>YeR)k0yR6F^T35&MS zxeHy$*>ffI8QICD+@;S)Zm-S zC`V{f#AiH?;lzksWseIuYADen*I=m8>)2HgtYi5SRcX6n&O*{6U&?<1tY}~|Z=DbE z%x<=&9RnMV2vRTEstkdz;}xm*MH7q1HEaADaf|2NG?&IYp1Y2%3oj7rbn3kaGC_8Z ze`GwFyug4_rnhEMnI~6)aQxQ^!P~%J^+i~-WLbE*vP8Q0ecFP)tKXj_zx^FN^zdUS17PEby}gm2p2Ca*$Nv5vo^|Uf{8vBxT72VKz_foL8 z$BS+@FZycS@(n+X)3-ez)8)%}=0ksir+??4VtVI4$L^u`U_N{r)6rGb?PXZqHbuEI*F!>AoKZ{Okc=X|5#%WPH`~EkBB~a0XrUA#~4dkOLYomVY639 z(A34$Q91 z$AwFm@sW?+hoi$Iz=H>s=gDWD7`9@VW?rBPeIk({y3SIjCP%LDZUdud9H$rh;HGaK zb&Dx9Ik=(2vBDg?0z8BohqiS&%`l!(sNAyISnjj+?f%AB3I$ku}Vzbx7b~J z1ohGP!k_#&Mw?*R0`m-?XO&JX;6}Zx?Ngi4+Lgi3&u9c+!_H{e2xZ#sBju->4CIk< z1XhX$sy3ore+SCx=b((b6tt;8z!OFb+3=aW3L-2#0RZTIAJw7hV6ZXT0EB7fH3f;! z3@jV%IL3DBU&8LnhK5d|iYq2wYI2C%@D1h@c1KTQd*RcVo_Z^GcmF)>+($5OwkYES zGj8=B22R{@%xAz*!J&Imzd~%Pw*B*K0Q?sh^6^*{;IlJL7d@7t@ROh8DcDUfhu`)Z z;MDVAWdpZ?G-xMF^~(EGNUFpVf|iX9rEuwm?4*o>`U&cthfUE92oVHc&s_^?Z}`Nx zF2^t&S(dJ97mz#C6q*r9{7UKKo5Nx4BB*Gn z1}}Y)a?cBpB@Od!B~f!Z5=#`F)D2}UZc#h&=}Ps+EeWA(HkjPu&hy}zoF9+ z-6uVxpo6lAd||6{t{^AJH6ArSruNlBidd5sA?=Qd{?1Rzp8Tc-Por>p?qyGeq-@8K zRnX*mr&1u|Pa?bpBjP=?QnRMy_(cf9(z|zpmuZ>y#0y9Ksv`M zqQU8e2^?cr+lq3dbve{j6B%a}bWjBt6BVapBLUQ)PBqt)f;wdb^JPAG{OjObXf)`d zItMrI?4bDhy@K7*jA1Ak$AZgOuj1eR${*qbANmvq0Mo>+%4Oi-ez!Zq-sut7UBAH( ze9x=!mtOM~`~(~vh8blrZmq6{&E7tS;S^54^c!*gtN#X0-}Y?O3e+Fk2!GZ>#C=>U?4L$ z2fjonx8iRUZL(->oE5kJC(A>Kwf3S8mTgO(6e*#m1d6eIB?3*fHS~k-cu)8-vTsI? zl%;8oOKGB|CP*$%+9N*FV(TCP3>a?ue3Tb{BXIWSc2++RBIvi8I(XfxjiMbT&`L2! zu{;Oed01SlFu^0EbX86h@=4eVVVYPE8AygxOC+z9)98+PzIP8ojquEs8E>I9aj$yc#}J{ z+E|kt8v=*J#tkqKmLYaBuz^rI+*tsl-Wa%hAykNZB^ni*H@Wxs0y%HSxrL)|_O zT>TXA^qVo=^Xn*A??xGS0Cp%NK^edasGY-iF>7aHMCCGmGkCOv)w#TH&O04onmjBO zWitS-FLKxj$B21nsO1*y-TqA|H+~sxa~8E0RE>YB-=fPPZj<^F7qUxRE^7pZpPNM1;j^$n6T_bM|^QLyVpgB=rvIkHy_$bOh~F6&V6 zfH0dQ(f=I-jD(T;4Kr*uBTns~#;d>V3-CkV_bnLqPs8hs-EP;8In}A6lmR0O9(wo* z{P@57T|9aIJoffB+-(^XKhQ+EaBEeoT50GpPGkvWF18^1(@9w|$=KHcxlJ`DH2fIi zIbZ~`dCVn-CycD=W#kP3bbO;kqcEBgRE;vwRB2Jus9#}Qx*1#R@RICou3E_WFS8#H z4Y6e<%Q6J$BB*mC$_VFm#jPZH)H%sMt>;)j>DfZyiK#hHYX?c!)|pz6US%HZ-4b3o zfBbE+ndEp^^?Y6AX58ZSB;0tAPrwMt;*V)YACV@7b0VH4($@q&SLmtP0Yl<*Wa}>C zGI*4QvA%USC7r-0y#&`fKeB>{Y0yholu%Ta%R-T@Y3cEt*=`j+imf-cio9!`i(!ryqhr3P6ya|tlH-p zoBchM{SChMYyJZM{(t%1xar0lF^mKK%2H5N$G8(7%OK zu+F47Gp-z~O)hlIq7K)}A^Gayinak5PhF34>z88xg2IC5i(nWHWp4m3J&vP0e*^P_Z^LxyVfb{VxxaB) zUC_W@g17~<4c*Y1@XlLh$rfGsW=QuMpz(0G-QrVsJ%|S%db~-;XWnz+UV&Os=LvJ2 zaq-d>Ts=H$EBhQj5snck2PkEP4I8)_s&$czIqv6r)G66?kXU_ zKByokh*s01M1MSsK6g&Al79!Nm+r@O|65Vd-Pbyqm^9?PomO2NK$Q(*BcyiI3xtl7 zzr6HLTr_CPl!b;i1d^Ux0HO~0<}AirUj#3wU>KTG2CN)f9~$xbvMFtmMMj?_9Se=0 zZP30v)#N&c;ou~j$IgXT9^_R6PJJOCWG#%l96}$Wo&uoOtC+4l0KfDR)Q5iq^Zmbx zz4|!HUPT!wm%5$W5t6#AurgrS9|51+<(t7$c(0&x>l-a!v%TD17dpd>JqJ|h>c4Gn z#Bl4^0ylpZ#=RS0*n@jPv4TD1J%BK=KT~=@6TJ?2+ih=>dIKsf4 z9AV>Cd3!pJCl>i#f7+`xdA2UFeLgJ;wH@ zsstirD+pmz7F^(ysczbRA?hGj&978&m5Ye1b20;ZWO7ehgavNbNX?Ilv=*@}wc@Dp zj~SEn+7ktktnSz>=**L2i`w{1&=KE%TU%}AGH!Zq{Oj?(uH)n^!U<^^yB4?3Cz_E! zqDr+Q;Ll(r~fqt`XBghmXqu~@78zN(ZDCi13;H88Zyz1+6xJj(*g(V25|13mJG2N3(DC9O z2R9WC+9Cv9;bf+U)*R@_nkre4)@bPjL~`3!9U2w=VFrfH=QU;!5LqRDcKfboP9;aUZ9XR`SKaBkwZ-Gxouz@SV_24`XKk|pT_=bOq z`8_{{-GlGL_VN>$4=)0~)c`QIoVF|6L~=JUA-3*N1&fjlBUlJ1w{N<-?L8DLV0HCp z2rIk}D;ZK}T4HZldToyjJxKp@9MBPw9xmu|;vJnIQ{^4!^6inh#$c&$QPXy1IR)ft z%+yy7zBS+)Z+am%FZg=YGdH77y_}5(aP6X1Mfm(IAGg!TK#Ni}aB?7SMK^8NHSo-S z3EE2ENn@qZfpV^<%uhdr?FWAyc=C_o^E0S8!Z4tH3Jbbm(mmR&7$b+hiQAaBbGg$& zb_8wKw)g{pW5xrIK7~tH4=~LY(=>DNug`Z;ES!*=HG3W!ZAH36rt7Z(HlW%l*)mJ) zB#6tw%(-)+gvi14wnpPYqZ~b{he@9bD(^*z#mJ)F6IY(Z_P%$c9-N0ex1T%oNiw-^ zFkTYpH95lOTD?p*Ht;8M+;0EOqhJ%!WREZiyp-5oNg*C))T6goUWaQ(i8v_T7LX=i zp`bv9^SK!kY2yHO7fePZqL1e3qx!U=ID8z?oTGbu1YXu$?rmIh( zJo8cP9{Mv3Mb4^oGSEmV*Rt+_^3!Fr%$Bo!ln!Y*{)hFP;y|oFiNYx0tW$0-UYu3#x8IyS0Y**Z`p#EEz ztx+=qFWEdYw^a~37%11i3Chedz+v?={OSY1l@DUN?^jSCdn?A_GB5S?nMa5Wu)_On zYIT&20cD2!3|L$?2Ui>zA4WPO@JHf%r;pDL){tN_h8q(6y=U@LAmaQ zfNkL5q?I|D6@39skD(ZM2gRjy5g(S09FPK}(E6vwBDK+lgqgu(pz3HNYVTuf>Q?%V zV5@%)+L5pttv2D-+5tk*10z8VWseZiJ!XYN=pY~4!dw{3297Y*+3Yb%I&Ns4p@7$6tRN-u9k50V9k#&4jV~ z=q&=JZc{CAY!pS#$dh=H@-!dcAX+;|Tt=nwl(G6>$5^n$BSISf=Sao%64v?!_7Sa6 z+=ZjG28+h4^W`M6vV2T`8m^r)J%b85k}YYZ0_(nGSyg&JMzKQci95^;L&#?Gf!?1s z8W#Qc33VlW<7bi0!B&#^hc+pY802V;o_15uYoc>lq2m!nSD^8*!-xVM{vvuEj>W4? zkfGRU!pHNsz!Ev#vM?G#nc7@tRb%Ja=cqG+3@^eVra)S`V-KGjqGQ3)1y7sRwiAd= z!2zwXcB5)aXl+eSh9lX-T&=56up*^FD25Sfe^+@H!H?q^(NWBhm750T7|6gWzXxlU zt!oh+B%H=YjV_Gis^K+MSKzuq4xVQE6CaShw>1UbcrQ}YOEZApb&BVT`wEr27XG3U z8dv^(o^kogW&E38_O zZvQRLK|d@mveMwl3@96zjTko9VejSNj=fiYKlX2Z7BEkkw_EJ(6?k#Xm(JnxhyD=f zfBS#N^xmIDed2@IU3?7l_7djlkYAPpFv}6G`W4xo_3Aitu*6nNvLYYEVL3wKEcpsX z7G?X*jzL3a*$x)sR2zuwt~@{>8D$b-El=o2hwG|t9U?nJJJ_8vGzHarBuGJwoPY&? zbTq+Phywx#U>Nt$!f*Z(>^=Xh+O|^+%v=GjrpB3C+DA=E=*Wfiy3&S(d}`5_^2T>L zDx$@~0U9&#O!+t(hE2iz4ld*9(FXz9CYIwGv`ZEZ$!6O^8>kx+ z5GNu%?q><5A-616nB6p(DyW>wO6`YwTB2b|?`I9{2Q&EL0qXWZJ6klVlz7&Tj6iLO z1c|@Ix3#NwD|igfW=z|QsF&}u8SO=8hC_44c|qOXW|VX2(G?hya+kbpOIW82i4PPLWB0O!Ble~Rn|HG@x`h8e#g zv707LJIBjj_+0$gKm3=lw|`nTlkIn|72`0#9hkN|Joea=_^DrhGoE<*9EQO#&lS7f zE^27}Ps7Qj9FFlJ$)mUCl(8QTV`~WfY0rS@_h}C}DHb-K{Gl9e$&6;JdmP!Te9`_v zTX`J+ux|k?uopbp7|-HSpQhrCBGc0L69v`w}Xze1vI+~8P z#Zc>(b(>WehNrY&a1#-jeGwJ-jhM5jW+Cv%I(KTk+lM6BU1 zASmX~&)ce6XCYsDM#r*_4!j%0oORltDvRUUBY07`xY(^jz5sra~B;y|g zmKN4ld1Uk~HU35Z==9Yfd!7X97!s?Xa*=JBoo~meUBS%t9*fsguA@Dz0cX-YN2CTB zjwGU?$w2^`!xg2X&GEU#(kL|`y&6`@mxT^wJQsMyQ_diiR6f9v15|%UKljS-L(_Sj zr;2GeVHgYc_BYt+7TVwZ-S=QR+F^FC+D#MaC|84x`xy7n;9I}xRrtZb{2Gko9%fBq z6%4Srp&VQZtsQpKBM}?ZQBmid2au% zT)v9Smk)TPq62O?5N?5$5kBlww_|dK%vXtS`=Z}!cB_&`<`?`ZP7hsjjb9zpC_vd5 z3^Q=yVeIaG2d1mfu#KB`6NN`!ofD4n9dn~s7U$|s6%+*D^jWf_%a|`b+1jg_dZB3F zMtb2SG-!+9jb+w8O~>-l_G9aPFB!k#2arwT_iX*v5a*o}!5H(3`RW1Y!-I~mpqOM8 zH@AZ*b*D$Tn^u*f!C4#&8H=IL2f*Qzz>^=s{K$u4m;hANU4>8Jjp36Epx`I5M%QBq z;rG0qf09M%&U-LKWVX-CwKf>I&w}UR&K=ueyyXi}_HRQmemr>`n$cjH9nfEj-D82s|5;1}M3 z>F!^~aOqPhg>4$si~?R-3)SPYw=p2(?g?@=kdQfTw#N`>7mRW*6<&D1i96sEKmErq zhyd8X8Gh@lFx>ho45w~DRcFt^Kk+bVq9xi+7dHU^{{R4xxlf`rwGQ6^0RQw!L_t&= zZp*=Cgd`tLHU+CY#}n_Z_h~Jz)hXK+B^t1XQ7hF;N9gvi>DVzG5|xpV*x#5R@!DzD zLu)J<={~>@`jk%5rb$tC6vI#`dpK^q;W~WJx4ja7?Js>J90TTg=G`#Eh*?LChBCn2 z@xBj!3P1BJe~2qr53x567zRVdEWd&9!n8Du5~KLIB2drKkM~E=CHGlsRG4L=*sHrzPW}oaoB9<>!>INB5^l zrd)+wPFv7SUMyo$1{W?&0HUYJU>A*ImDudZ>NRMF%BQkxS<5V~Nl~A<%$zA%(3;x7 zi6Pj~`rvg)G~_2c&c6kcAZ^{AC~vcAeDKiG1@jkpt+;~B*d=n&nWwt05wa9=SXtZ? zY6mjlT>rHy6(xowj8ut%gHUswe_VC3o ze-ZxC-~3M8aqF!pWkcvjTH0zP4A7QK6s|-7;z>1ZhCS?GcQeM9z7D5e`Tf{?)^ky3 z-jH0ZVlz(I+jH(txcDe8zwg&@;r0I$rVsr*{K-#XzVZ~z4^ez42bC)=K&LMTHB@1( z<~IfHXma(L>a?`2VVLQ+Oah516QsXOlzr+@Iz=4q=9z_fHH}V29Yz) z_qBcj7cUAP-{+O=NH!J|aPmKR56CmC{9V-UjjL0(SN7V|TYVSD~5 zlyTs$3-mi9T%@zSU}@sUqkW~S+)LY?v7ldr4Yp_gLrhKt+x4w?qDR>662`ge*j52{ zTVQ)tyC6sptL!WDBww-&yMfYX1DXfmZ1h$f?uV#{=TM*dG>$&;CX6^j*$|hMwcj}- zJWX4;S+Dy1%zhv-DH>UNm*kdzCC%nCs1MQ9vKPQ>LEXC!<>oJd4QF)we=i+WIyx&L zyjy(huClCBuxlqpi0$;jCu@IHPop7pyWfgWJ{lY|FmSg@;8vaX3%O+_>e+u*C zzlZHzzlP2HFvfkL6n+lUyOk$MvUA;lKLp-;6K*;+F!pK^Zt%y|=&N8UHfEXW;V1EBN`}dOP0x!H;8}XH+*# zyP5qhxZ6h-a2Zxn{WaZEni&;A{OGQ=A_@s`<%wUKPBP*IEEHVnnoNth#Gf_7>^qo; zO(fp|K)O|!e}#ubPF#TVlxI;Qhoye8ny9QH+|t%TZUfNpUItQ<;6)b8q%X1R@!~@i ziYA=v%-Ll6TXE&c(AD)yFO{Zp{Id+lV~`4{9RMeCr*%b9N#Kc8u-U)%vVwFn1}BA_ z({$g|=O`XbO*vx!VUK`k7V5|1x#i92iLk_+B_0}FoPb{wX#Up{P6)oFA;aS{>t4*H zxf)6+VfX|IcUa_8S;Z}MJZ0~{C(!1MUC`PzvFADV7-v$B)e%p`uf=&3UUQW}q~;2G z;g)zplGsI!?p3$O7*$(J>tGV)C*#GiHli7s6kG^}IO9DRmebLY(cst&+`ctC=4r-e z*kBk8PoKMhpZIrgz}@#h2{R7RsxCR3ry1Mb4(^UyZn_SC@B6&gNR2rKXIdsfcU( z+h?Y`Xi_~|abXBYNjVfR@OntF;_O?*`Kr({!yJR}kaNd2fU=Wxu878oA|b1@l}{XQ0-ZpP00`@teB?09|(Fbee+i z)g+tXfoP>{ba#L;*;I%Q0G$=H0-qf4ip?I+${s%O32Z;~%fK@qK&=-5@N>#8_F9R- zj`TtCx(83VX}5uMbYRYvIM;cp;hCN_BqrtBj08X$i9I+VKYsRm2zyVMBL+b9Gk70AGzR2XWW8PK_ zLqQoFe*Qj85C1WChv(Y>xK{b?aa=>6sdjMC-`snH2GrbL-~eo%P%k}+VRr}{3QD2u zyL{B7EH z2++=Vm6hUX~IQ?aALc=xz8rf^l9aDQZAkqw`y)5eCj3GVyiVc)Ayp@xLopN_VLrGI z_0oqhKk}QX5C1++mGda20(AmEiopp5Ljj5=i=jG&kU@AfRMje)et@`e&b&=l*Q!Wb2Uu!2%LQ>%I&Yic*9Fj$|=+-21mj77|KXrLYPVam%J1|qD;^ccuVJK`}NLD z3kdv;K0`RP$qzzDq`PcFlxudsairlA#SOj9F=W{5kjtit$*3Yo>$y@0UFm4EeWg{^ zRwW;}t1Whu^{wgSIAF8KFDZF7yyS(?#((>_{wl7&;W})_J$?#x=I3hN9ph$$VHokm zQ|IunfBp~f&|^$EMy@deA^ z-w7ewy#6$dOo=T-3TbUAIZJvrsEMa!OL(y9i+4-t$E#MHAB*nLo7~rxszl0pGFiZ~ zeVREyR_&epg__*pkI1#9eDQj|YN z?YabjEZ`m`#?n|UODzZE(MhS$(m-gXCRnsA*#4yGUK48>0S*5?R7y$hX-&=Ac!;1zmwrln zYRSz}i`5RJ32?oma8h8}?Qpa`!f(9kJ$TDIKZ4OXfExDpFmAZjbe_2dbu&8t+P8c; zzU|dt22|taK0JiTZxACc{9)%fAbN$$NdOD^@DiwLHVnf)Hm7gG{!70Vn^*oIPT%oD zl4pi_H^Y3!=sRr6guOij<{ggi{{$}n;ZNe?8~-u3pZR_Gm4~sr@FXxDpw35_<_Qj9 zimj@q)zL76NnYGmofz7FqrLX`2o5O#kbAxM+T14(dAC9tOnc<79Ga{=u6lgsAb~Uy zBIukj8o}F>>XcKPvDdfd;L)kkE-0&B$|9M}B89dWy;NWH2 zO@LR}$WLs+c)xi2JYbpxXf-X`XLQ6psX3Oi;~WgqQ!6lFo>0s&4i)vG599F8U&8eG z2XJ)w6diq4qtXOgbO(A2l+F0jLOFmaK{xqQD-m*^xTVu8KJnQHaq03^PDU8Fde&)% z)xPE1!Owji930@n`OBDV)qpw4#N`aZV8aIG^iAB_&_?-UQSdGC5#cCGHbH2Wn+9+I z*^YG>c#)yG;81o04CWJRol)umwhz1)^}_v_cU#sGIPwlgVBkt6)ZoBa7I;dZ*Vvr57^){4)6Id+Pm7GUC$gJpssAAd47uFI*OuH{^ zfQ@@7H$ERYbvuT#m$a5PtKp!33`Bw5klwX!Xs@e<0Bs4^Pb@4yUwFYPM zFL)A#GgftW?Ihz4tU6u9;WHn{eEz+t5Bw_d=sU3)4(K*A7XU+@OcR=M;hlPcG`Y!G zz`=Vt+NF@PVH6*Q<(h7;)vnm!*Nrm*;&~&G5&_y;l(i}0luEES33w*E6geZaN{Hn4(khF0 zB>i0m(xm=POj+bHF^vV36MafG2}duVYvv?ge6rxIk_BR$~tBAu>GX*~D8 z3AI(|Qc#d>>S0A&<~@Rc$Jw!h%FtjWU>UJ>)e#m%Fh}8x_X%WW2(DTD6OzQ@V=yAm z!k_N3>0e4)y=G&Tv=)ABW(11n`6m6MqFP?b!0G;|u zA8iv0lwP-b%#5~#S*yD-6VK3C*^EmV-Nq>metMcAts*u7hXDG(B48|6V0zsg zct|rON_Xm9XbUwfp1rvdv{A&%m?+rUP^5Yz6GAt%Rk@)ZgfLHZDiH$fzNOZh6B7ds zl1@G0=i->ttzf+Qg&1D=jVL$X!3!cQFF7hkoL!d)#emV{d)JV|ZiGWDwb~*%aS)?R z>|9?DK;eKBvC2n3q)wFIFjQ>zfMPR_9{3QpAN@7p@+aZABKkxx=zv->*KYd!rMAz9 zTpU~-=hl9MPdrxOv*XulkD!!+8%&CvgF;>6Heqmr0*38w!j;1#wRjQ`oaZEo z1}QcG`!~XEq{GkJn~u_6Z~~**8>zF!Wn_)%;O9M49(bQNXZv;D7QW-Ig>eK|{V(2w z`LXw6I=T!iv@P6p!}=|D0)&=Hv_RKiewVzW?hfEjKZ0UacW?mKzi9}E>CO%!>10_4 z+y+vTNvoBEp?>Z>+7TxyqbW^kQ@?<%@?%;=4)c%b8(uzJTcA-!n z4$Zh2Ctke?q-c=m*o=Vt5pd-R9DVl9z~#qbBip>k-3>tlI628l5l4-Fh`EKec%aD+ z4&Y;PgWq&@u-%0(zzGSK54%J3WCxx4Tg~9ZfLaT7zQK6=U%+_!W`3a}ZET_KZ1Wu* zrT!>swcaa)D#I8&Y(i~8=}Py7L-jteh8yavuUWW0&#B`|r2y0JY3$B_ z1b*pHQ1AOSlye`%-iDWadY$>D6AXZkI#JeL2JV_z5l*O_C<4_ot)vFIRR8-QEC8sjZri_Ph0p<=+Ky8#;QY&m3>_(%NWHQG%ubdkcxcnJQBnJs5a z3cDp;1@(rlgDI7Xf)m3-Z_iO-YnP1|LZcO@KilzDeafSp>2JrC=&z2AMOe_d0vG@y z%bG8dIh4PZvk0@4f=F}VuVZ{ET_J+@o3{m(g4h%)l}|FEX5-p*>gqvcK*L4%u3;v4yA! zK(@Q-dGrIEFmuShIrK^D#74asqA96-1MMfug7qtMK~N4oflu+C;+sgLf}AGizh)n9&UJ7)!-C%qXQ|*xR5U9pLgu-;T>~`f(h->nCya(EBl8d=%SD&!Auj zLq)CZDz#Z*C70+~I^Vhm$xM^R$ON-yKD%@Ji>v*P2OfGHcisIU+<8{FP7~an69mQS*bTfL+UtzN z!y`O%{t~9j5ikc`eKH~#Z#JTwxfwR>^ZbI&?85raHA74`Bt21{5ODrF#*)|M9e>p# zVw=11Glzh|b_ba5ekXU|9328Polj>otTc`hnG;FxD)m953_%EZ(F*DGN=yf4*BbC3W|*G0ZkF+b}66uUhtiD3r9iM@XgB$@GwA z9}rwKq%;neMF#~c8>PluH3?UE$r`|2I97OREhkfq$1O_5?&?FR7e54Ccqi&TzlzP( zyD{t;2VJ#tg3bzW_;=TYm6WwDwn(3$0jGhQDVs?cp>UmcbK}ksX|kDif@r6PZLWje z{1qs-ycXCz8^FL%@2V1hc98I!USBIvd4#jIuUWL<wagd#ur;ohV+3g*!Ug98Gh zc|{g)RzcP}@KbE;9Qho=mj?4C*{kj`rt}Cg29bQECaPZL^iH;PUFwO-o7rke6M-qx zs8>b1IEs8D=or{`x5F@O@ci3v!QcDA@4!tr-hkaSW2!UnlbJdBT8s-Pk3ab|{>9J! zJ|21eY0ML6r2DRcJ|JW0csRm_W`3-nH3_q@1t}yyf%-}K0haJ-Tb4nSH97{y8>Lu) zWf=!>ax^Bh0k!|$JQBp^vs%eAZH)$SjmY2=R_Q5zCGP&zV{`4xT26v#O=o51juW+l z*6KDDg7mA&D+)#1O4)(d;;^Q8oq73iLWtcQe@-^>Cb(n#S(a(+W5S6bk41E-%aHo2 z_)8ZkT1A+hz@F5%`Xg%f&XS4A$r;Q!)|k@lr}tJUfG<+hv$So^pZ1gg9)D;8H7tn; z1hT|MQhUzvfE>0}dP1Fg*gLmlp?jpuXq?EzMyuzS6T`_Wz|ft)T)Y{PHO(zgZ23;{ ztxR_eb6UhL265}Mi|X{Gt+30~6iy;8=|oqI2w_kt947Tz9S)3S>~1%~3b5I1Fi$)D zr#HVB?|$E>xLqFwrVIPZP`Fw(0%xu}jUV`)ug9xj`DNJKJI$4UfVciT&pbxQF`#H5 z!0&_8=`xf}(SV?!q)!x$!+>$v@Xmqi*gJDG_CNm{F~0H#QJ(dDdC>!g{Sm`ZFwc&< zn}B(TQg#?Nj$vbVI#*oMyv7!p&l^%e>K4xg}ZO2^So0MRD2z zH?yiXwebGUe>)5%wF+KKv%-F$)8FikzZJ!;3e0zrm7~xQ>UvPKKb%*)NIn)bJ ziBH^>;I2#BDw%CzPjlB{))h4Ag&PMbd}hP1#`eUi$aE$(*>>_zd<>a8b_0XiH+Kb#_)}PtJ-c(u<%+@3Q(+K-d@3c=|Sx7eLF@!!Z3yhF-Vj9 zrI;2*%%IgW9h(W75E;o2YdoWy%p789QU9eKGrZ@3IR@!W4C{wc(xOfo|wgfcvF>;q`~fp%`BofN3Rz}x+p&wybt z7$$5l--Y?o2T&jTeboD3k3BqzvR6=sZkM8uw9-%GP*2%2A|`ks9?F)t$^agF(w9(( zCsUiOO!_jgEzFa{>jv077v;8Z!f@jkVc1;9T@CXr+iTKU!U&ra%nPxGjygQX|yFRt7N>=ilzSKE^Az$GA6O z7!Bh%U@-ohry1{l-$(GvzxQrlZmZpq2!3eQeL-hJtrM4tj6SVlmRn?hZ>092wwrbZ zrMx+Zm>}MTP1XdxY%E}acKY!-m1)+Z^SI4h6V>)Cla!;HThd_D7@rVUn%G`i?bi&^ zZjS#|2uA@OoQa>IOV+ZW2@FKJE4hfN2V$tBI zN*5KkkQ9HdP{#;c$B3~JIyyZ$ezHQPwEWs=2#I6$oCAS&nk>O=)+^pyDTY&6(S<{{^qZ@YO$r@s1b6p`8F=M_2~l6z;Xc=Lzr~hEX@ZUwH}# z@B1Abyz!sn=so`)yT?9)`SRn~9iE5#%+Dt|c`Y>M+z=-NIOs~F+E`(uW3r8RRMQqRCh23-o2p?KocJHZR(L7kJfpf}nyXg*>9hmvOs8pw^Ovq*nkUUp#R@U&WVO5j zuAIIZ*t?Ds0^%7jFq966XG%c@H~<#v8ke<|(53@nZZ*N-aXF?2Snfczf+>NB5)4b-b?u6&jjT6|R{?W_o1HhN_985y6Y3?8w6K(IGL zGj#zo-bDvBsKbM4=huMo#uuTSzLhKKj7d9bC89`Sq6`GBwv91&yxcz(b%-=-vBZ-u~AUtNp-~^!y;#YW!xIOV|6K<6yHV5 zb{8SQw{{_HliBOG8{~P*));}NWK=`Z-1I7RTR@{&t}>1iDMQ1@G;yrsVqv+bX~xlZ z#_3b1@VEc-*WfF^>}A|Zh;bsz6U{Sm@Y#VHoybtDBnr#Jc73RLt2n012Qvuuxyp1EhKsLAf{$eh^W9KB{W{A z*A>2`DD@Gm5Mm_XGQonj1lpciZVj**+?KC}@TG#j7P`$O+=fvkx0>`AP+EF^?)axp zDcL3jFZ8$wG#|}AE$~oBLsPrLaS<~7<9R~vG)1!CIbS>)`tCm91Y}Q=O_#IL{8CaT z`!Bu)&%Nz7xC3+L1$*Y)%*E%}{wUhrQDUz@ z_?>Hj=Y&mzJIn?{!R%G5iX+A{0Cj+4gK_^BoO#)|p?vj^0Jpu6fsZZcb6~}-a+8Wj|@SGWjdG7;HmRU zD%V+V>P(f(J)M7xh9wSM4W7D)Sk}DmJs2*}+Lz0x}we{62I14~| zt6!?x++cHe_UZhJdv&HmYk*VJ*yx{AB8=j3iJ5UC$>dw-eiatT)tp=f{|6)sd zbU;+J?nr=V;e-q?EsKGhSFX?(tz?_=Z0dH4y**&?BV769+i~=I+};UX-R|(2`yPS25r#X)v9v`%b~l_*@#?@-QKuP?KJp|E zuO5-F$)=G^ZUr?PVEfm@H)nb2SXV0UZh_i{2M2kY-Jq??O_!vnx{twQOQwvHP9gxN zbB%?on{{^X-YEm2Kly3YNAHBsTTbkRW2ngyfZIJhb{E8U;>xqlyX^tCkKO~@ZK)Sk zm)*$`=6PrR?i3s9SdCw=f-JDW`xNz7)f4-;DA47XY@=WHyf=5Rb5X(&-R_n64hK3Ex5gS7-zJ^`2!> zqBXBZLxfPinDnRqP#)n4%bqWwMoVc>64ZdeJlX@J!Lt_jl&z_Rng&a;AL{UPZ?9M< zuUn7~QeQjGU{|b=fM(=V65CP%v)x@Z8&O!H@mucjD%oZ^Srk zfI49}P3^+J0>fwn?tkcU{Hy=)CY--?8H08RbRI(&s0J5ALm-+5r}|wCvMdOW{9;CX zO?DlcgpWQsu~Cru()=COEgT%t$Q2^JVY^6dyEhwpfksnG<}|_Tx(4+ZDLp+k`q?qB zGp*t}kd~!aqCd&FW;mIi)UN=kUO>D_K`$*XbaWBP(EK|9QEm46)io;9&sVxdM84^$PyrogcvKfA3E*7|%e?GcZlusyIzE z>I|GYa|S=~SHBM5_6=W!(`U}|9ICb@$5zjRfxCEtSa>;4Yx*)OFiX2UcS#4r?o631g@X@=Jw_V$4BR6*GQ z+sE(5#kc+(j^6qc*nRBvn4bJJ=BrO)cX)}Hj+tSW(^K`W^N?I|TR075aOjPk`$nUF z#cTtWVkt^((F64khBojbZ(26x;UBUmI+d;;sms?dLuf*K)4(rh2%8z zR#@*D19xv1*2QSlHhZv}UWWY_eGMuGe*Vt1CDL_yoYUS^Ie8v~P5=fDSV$`;vRYef zh!H1;R=QMubPB~BsQhAuweM*=#<8N53Y(8`_^G$y@PogAqYL+9ny+%;Y`VZQt+-ZH z>3JMUkc}`-3T$^X?tAbF+;#VZ7&ikpdn3^tv>o4^I^{Ep^ZdU%mzFPHJ-~LZ+zqTj zBPZ8_O2v(5P)^;%-YxBkjJ_R425_(#LgL_{!np0&T?~}o>5BxEquPP;n4vjmZ9+sl z8;1EZ=KJ3X9G&MSYC?bmUwsiIxaSs{qFoIR-(JS<;m^XR9d|K=SmWG&b3}UJTf|W_ zx=yf-8Q4^bdj1*!Nv@&)I^XZ0J!k%Zq+hhK`8aEuXb)+F@d7$41OF z*-fS@Z!ZG`9bI2dyrZr$&1=Q1mGbHp1;B3i6n5u71V8r<)cb!6!}R!7zGAYjCJmn zr{2WZqV}2Vb0LxO4Vj!2auR9jZ6MMYA#e<&;@`21DQ|?BRBcr8$2^XB#qkbcnkt52 z53hUWm*7YK`Zr^5Zx5vu>~@ou2MojB9vp_c+u=R${}|rz_CLimZBgeLbDi7nG45dO z!617Q2sA?#0%R`QgJ^6@SDD7E#|FoowFQsKl(fz#>$DY3D zi|S55f8Fi0SoLh06+1Z>j*)U)9$8k)+{=d3f-&zJE+e`Fv7})c*6-BKp1&D>tTGGH zmUEpJ2@xN}IXcfz!d-!+t+4|eYLa=kRSA;I$wVWlgZ0~cZNqay zwN|uQo!6*#S>vPH!8NkXM>yitA#JB z-*5&aZ?j|JGeqZJnAU;^UQ9RR6R^SFO)tRad9MP_K8vf?ru!v)mXj2CLNw?eiE!Mr zgJ*J3jE+;T->@_Y4ZTX4l){x~8whRM?NCa^W&mt=1y?`*2iSe$*I)+^!t9VdDbb&^ zOc}xnm5cA1J<=`lK0EGx@KId2c!{ewa2Oo((FDMGbGY;9i~EdW;CG=b9FINm49=au zBpJoTTF^zgmNH=6KZ|nuHu!9)(7Ab$3Q$%>&VAK8VQ6LDq+r1;ukBNSq|K#(HM-Dd zs>wU!WshcnPnaJ4D0Yv36uYA%SPY2GP;4O0mAf)r$8X##yv~@X3Dbphm>++L1L;~Z zS56X!UE%JJaO%1>bq=eT7Dp=dj;JR{k^BinXLl{GG2?v)492)nWmd$W8v4vQhhw^W z74y+yY9p+}oI56v#^4U>AG5J$uZO^N8UDlvVUOL(NulB>Bk8p`FDnO!6C{M~g&YVX z4Uo)Omuqs`)OMmNfa24R4%vVZcOzSHTy=w!TUIpD8oayiS=ik80^Rwd$z838Bez+B zTtB;*!@j)d4hz=s(Jlt!Ln%<-+n_!{Gxc8`ZO&T3d)oF&O(P@i9Y%}{h?l_3%#+C6vv=Pj*F~{rBP4Ci^ z?F?*gfj#TBD7XAY4Es0q-9 z_}HiKMfDk_=yS#eeaBHlN`i`z=*{t=t}W4&p$RJeT7M5&#PJiUM}yt5=z2zwgl`Gc z2+_PEG_*cP48y8&AZlI(##}2No)Z(D$3l)hPDjYSKPLDqxlkASd*?G&cs1j^D1WT( z2y8y>`I@XdF=TvIwC0!eU|q(?s<|d|t2A2|JfUcsg5(K3b=uKW zt}9!=W8ruw41kr!hDDFuE2MK!y^FfEjWz~MQP09?ntn4m4FD7=!vi!k94R^9F`N_{ zNg439GOz2`R=yTw9NWJ|=te*N2p-=~!u=SS1qLLXY?8CklA`xgzQ})!hQ$w%4P0h? zd)B|jnH#1b$2xcV^wyX_9sw8NEyEBLwJ`XhYsqj#Z{ z3XF!bHv(E|*zG3x0Ni-PY5eH-z8cTI?G{uYu$^|ObrPA}w#I$*TutF>IqBw^;gB3x zz=Rfmv^|SkYDs-D64u-_2WBs@vcY)f7My;`YhhpgUt)N{m!hIz+VK|ZaVQ$>klr#5 zx*fa1tio)EajX~$P_V;v@13~##-G6Utv`XIyWfKCxqC5ReG>ETKtpWjP6$uN*qcit z{IjHjsBqR9yO5=0X&YJ@G*_1SqkYEeUTh_1TF)1-J;ld+{K}pgaXS_=NQfvt@UQxR zH{!oQKR^mbUyV!@Xz~d#*l-%S=}WNpqOZXW?FX(pPYpV{06P{gjPy^iIrKewM_aLq zT7olxb7eD}>vW{R&`diZnOghKJg9Fr^D}Hmm$Cii@8jqbzlNiW4`H6K2m`LrXeTCV zFS=23&;WAgHvio;;m(hI21nZ?t@3pF4+TKwC%w$#hyk6!d2(F1d=;0jTy4h&$Vzch zelSqrHexvYY_0;zrs|4=#1Zb6h_lEJjpxBtP!AsHJLOROad&tT{{mX*zb0##SC@Q_ z1!a2yyZhe-o3C&Z#AojGkRAZh=GpG!(|5H_n9o0o`P}0eOW~Gy;h@XeVVY~=mqkh+ zn7{ySwKw&P+$jR$m{#9dcWJz2rf9ipVN$5zH9RI0sR8bNB8gwR0Q~3>b+==`D%(ZZ zf^rXj2G667Suyyur zIS*_q3={hl9eY628x3#}cWQ7nM_VUTE<4qD5IRMblrqOoB^eW^?W6t#jn0Xd3Sc-3 zzxf;BH-0V3-VL$=LB8yq_|RA;p2stJuyTEadEWg>SKhE2K;o}ndYjJi42;VK7lnJB zE%ZFCodKzR_DYVS)WCF@F_~wIUiRFrx9;iUQ?Er&D#Ye1Av*E82KxP3{R~5fw`di# zpPJMy#!vmt)$qJ$--`d{N4_1m-Fhqb_xE-Aam74ODDD`C0rPf;&)oCy|DUw~4z%nz z4m;srb)R$Zdy^Ap1{fqF5d;W;IcJJdR-|lMwrt6gz1~k++w$&yyDP7E$#2)*mA#f6 z(+PE2 zW(||`3M#m>waIa8`E!*<`L-vwz^sAJOQ%k}=_Q|qk5HtcL-Cg=Y-n%=_&82Xt{V4` z!@8>71)_18;%%#frsZj9^=*(}3jEsDY09^ap8}h;1MA;OxmuS+c%CU*3donn?6xe1 zlQObhzVT@Ln+LO1=0-qRvcmbsaJrlNw}Ggw9D7Hcb^vV*;1D9!zcTS=BU%seda@zQ zCk`va>0|_NMcJdV1EWDbq}uMbh1UVqx8DgH-6t~e1#h6m<>A>c2WVi;=2iezch#TF zP1wKpuY-Z%v81We`iH|=h3W+8|EiP50(3nC3FD*8qn!uV*XMla8*k_BZ+J1Y z*_xi7N+5)&mD;=8*#uGmdR5U=C``?}f`i_$U^1Qyejx-s{9Ee%*pyXWGB$yxnd!nS zMB1JES-RrT|#<6dPPzQk(@Jqmmqi0Z_!APgr1l;S={?6 z&b{~N=sy0>=^p+Vi&NjEyKn;Ow`dx@PwA(R-i*>MwV>r2J>G3ahV{O+WQES^KF%f) zQo;qrmoDavo*LN9Jf)>Vd8u*{~LtwOZ7%_h&fWJf2%9*Q6YyLuv+_CV1L&=Dr0 znkf=BO}|jhl|WD13VG`+XTSKnY<>0D$s3O&c?+RKNMz|rsR#PTgcxb&E$1(6@YFMBl&0*ujhL`M@bXM(W`x~G zNYW^-ET;6141JNDe#!~CFG7qry1KjfF*f%&jr%-iX>wLgnGp}n9qI8qS)BL^-ExZ< z{6z$`d}G`heN{k=pGoe?Pd`T5I7d!BQ4%31Ldb}yoeu3Btv_V5v!KQ5V%&)#JB