From f4a96c488bf4bdbfb1729acfb66f7ec94e9f65bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 07:35:47 +0000 Subject: [PATCH 01/24] Update ghcr.io/naiba/nezha-dashboard Docker tag to v0.19.3 --- apps/nezha/0.19.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha/0.19.1/docker-compose.yml b/apps/nezha/0.19.1/docker-compose.yml index fbe4d0ca2..b8f2e259a 100644 --- a/apps/nezha/0.19.1/docker-compose.yml +++ b/apps/nezha/0.19.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha-dashboard: - image: ghcr.io/naiba/nezha-dashboard:v0.19.1 + image: ghcr.io/naiba/nezha-dashboard:v0.19.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 11223ed545e2d74a08dad600e6937868c793a0ef Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 23 Aug 2024 07:35:58 +0000 Subject: [PATCH 02/24] Update app version [skip ci] --- apps/nezha/{0.19.1 => 0.19.3}/data.yml | 0 apps/nezha/{0.19.1 => 0.19.3}/data/config-example.yaml | 0 apps/nezha/{0.19.1 => 0.19.3}/docker-compose.yml | 0 apps/nezha/{0.19.1 => 0.19.3}/scripts/init.sh | 0 apps/nezha/{0.19.1 => 0.19.3}/scripts/uninstall.sh | 0 apps/nezha/{0.19.1 => 0.19.3}/scripts/upgrade.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha/{0.19.1 => 0.19.3}/data.yml (100%) rename apps/nezha/{0.19.1 => 0.19.3}/data/config-example.yaml (100%) rename apps/nezha/{0.19.1 => 0.19.3}/docker-compose.yml (100%) rename apps/nezha/{0.19.1 => 0.19.3}/scripts/init.sh (100%) rename apps/nezha/{0.19.1 => 0.19.3}/scripts/uninstall.sh (100%) rename apps/nezha/{0.19.1 => 0.19.3}/scripts/upgrade.sh (100%) diff --git a/apps/nezha/0.19.1/data.yml b/apps/nezha/0.19.3/data.yml similarity index 100% rename from apps/nezha/0.19.1/data.yml rename to apps/nezha/0.19.3/data.yml diff --git a/apps/nezha/0.19.1/data/config-example.yaml b/apps/nezha/0.19.3/data/config-example.yaml similarity index 100% rename from apps/nezha/0.19.1/data/config-example.yaml rename to apps/nezha/0.19.3/data/config-example.yaml diff --git a/apps/nezha/0.19.1/docker-compose.yml b/apps/nezha/0.19.3/docker-compose.yml similarity index 100% rename from apps/nezha/0.19.1/docker-compose.yml rename to apps/nezha/0.19.3/docker-compose.yml diff --git a/apps/nezha/0.19.1/scripts/init.sh b/apps/nezha/0.19.3/scripts/init.sh similarity index 100% rename from apps/nezha/0.19.1/scripts/init.sh rename to apps/nezha/0.19.3/scripts/init.sh diff --git a/apps/nezha/0.19.1/scripts/uninstall.sh b/apps/nezha/0.19.3/scripts/uninstall.sh similarity index 100% rename from apps/nezha/0.19.1/scripts/uninstall.sh rename to apps/nezha/0.19.3/scripts/uninstall.sh diff --git a/apps/nezha/0.19.1/scripts/upgrade.sh b/apps/nezha/0.19.3/scripts/upgrade.sh similarity index 100% rename from apps/nezha/0.19.1/scripts/upgrade.sh rename to apps/nezha/0.19.3/scripts/upgrade.sh From 6f0926574438bb39d1513a3cad0e54fdaf3ee1ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:31:15 +0000 Subject: [PATCH 03/24] Update casbin/casdoor Docker tag to v1.675.0 --- apps/casdoor/1.674.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/1.674.0/docker-compose.yml b/apps/casdoor/1.674.0/docker-compose.yml index 8f238e115..25211d0d8 100644 --- a/apps/casdoor/1.674.0/docker-compose.yml +++ b/apps/casdoor/1.674.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v1.674.0 + image: casbin/casdoor:v1.675.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From d6973c43f875b6a5df50935211bd83ef4fa7e8b1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 23 Aug 2024 16:31:26 +0000 Subject: [PATCH 04/24] Update app version [skip ci] --- apps/casdoor/{1.674.0 => 1.675.0}/config/init_data.json | 0 apps/casdoor/{1.674.0 => 1.675.0}/data.yml | 0 apps/casdoor/{1.674.0 => 1.675.0}/docker-compose.yml | 0 apps/casdoor/{1.674.0 => 1.675.0}/scripts/init.sh | 0 apps/casdoor/{1.674.0 => 1.675.0}/scripts/uninstall.sh | 0 apps/casdoor/{1.674.0 => 1.675.0}/scripts/upgrade.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{1.674.0 => 1.675.0}/config/init_data.json (100%) rename apps/casdoor/{1.674.0 => 1.675.0}/data.yml (100%) rename apps/casdoor/{1.674.0 => 1.675.0}/docker-compose.yml (100%) rename apps/casdoor/{1.674.0 => 1.675.0}/scripts/init.sh (100%) rename apps/casdoor/{1.674.0 => 1.675.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{1.674.0 => 1.675.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/1.674.0/config/init_data.json b/apps/casdoor/1.675.0/config/init_data.json similarity index 100% rename from apps/casdoor/1.674.0/config/init_data.json rename to apps/casdoor/1.675.0/config/init_data.json diff --git a/apps/casdoor/1.674.0/data.yml b/apps/casdoor/1.675.0/data.yml similarity index 100% rename from apps/casdoor/1.674.0/data.yml rename to apps/casdoor/1.675.0/data.yml diff --git a/apps/casdoor/1.674.0/docker-compose.yml b/apps/casdoor/1.675.0/docker-compose.yml similarity index 100% rename from apps/casdoor/1.674.0/docker-compose.yml rename to apps/casdoor/1.675.0/docker-compose.yml diff --git a/apps/casdoor/1.674.0/scripts/init.sh b/apps/casdoor/1.675.0/scripts/init.sh similarity index 100% rename from apps/casdoor/1.674.0/scripts/init.sh rename to apps/casdoor/1.675.0/scripts/init.sh diff --git a/apps/casdoor/1.674.0/scripts/uninstall.sh b/apps/casdoor/1.675.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/1.674.0/scripts/uninstall.sh rename to apps/casdoor/1.675.0/scripts/uninstall.sh diff --git a/apps/casdoor/1.674.0/scripts/upgrade.sh b/apps/casdoor/1.675.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/1.674.0/scripts/upgrade.sh rename to apps/casdoor/1.675.0/scripts/upgrade.sh From 5101a8d54a7b732ef1b8a5aabc60ed5deef59dd0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 02:47:47 +0000 Subject: [PATCH 05/24] Update ghost Docker tag to v5.90.0 --- apps/ghost/5.89.6/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ghost/5.89.6/docker-compose.yml b/apps/ghost/5.89.6/docker-compose.yml index 6abbb1e43..92b854ec6 100644 --- a/apps/ghost/5.89.6/docker-compose.yml +++ b/apps/ghost/5.89.6/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ghost: - image: ghost:5.89.6 + image: ghost:5.90.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From ea62d722652f74f40bb79371d8d9320f2c7415e5 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 24 Aug 2024 02:47:59 +0000 Subject: [PATCH 06/24] Update app version [skip ci] --- apps/ghost/{5.89.6 => 5.90.0}/data.yml | 0 apps/ghost/{5.89.6 => 5.90.0}/docker-compose.yml | 0 apps/ghost/{5.89.6 => 5.90.0}/scripts/init.sh | 0 apps/ghost/{5.89.6 => 5.90.0}/scripts/uninstall.sh | 0 apps/ghost/{5.89.6 => 5.90.0}/scripts/upgrade.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename apps/ghost/{5.89.6 => 5.90.0}/data.yml (100%) rename apps/ghost/{5.89.6 => 5.90.0}/docker-compose.yml (100%) rename apps/ghost/{5.89.6 => 5.90.0}/scripts/init.sh (100%) rename apps/ghost/{5.89.6 => 5.90.0}/scripts/uninstall.sh (100%) rename apps/ghost/{5.89.6 => 5.90.0}/scripts/upgrade.sh (100%) diff --git a/apps/ghost/5.89.6/data.yml b/apps/ghost/5.90.0/data.yml similarity index 100% rename from apps/ghost/5.89.6/data.yml rename to apps/ghost/5.90.0/data.yml diff --git a/apps/ghost/5.89.6/docker-compose.yml b/apps/ghost/5.90.0/docker-compose.yml similarity index 100% rename from apps/ghost/5.89.6/docker-compose.yml rename to apps/ghost/5.90.0/docker-compose.yml diff --git a/apps/ghost/5.89.6/scripts/init.sh b/apps/ghost/5.90.0/scripts/init.sh similarity index 100% rename from apps/ghost/5.89.6/scripts/init.sh rename to apps/ghost/5.90.0/scripts/init.sh diff --git a/apps/ghost/5.89.6/scripts/uninstall.sh b/apps/ghost/5.90.0/scripts/uninstall.sh similarity index 100% rename from apps/ghost/5.89.6/scripts/uninstall.sh rename to apps/ghost/5.90.0/scripts/uninstall.sh diff --git a/apps/ghost/5.89.6/scripts/upgrade.sh b/apps/ghost/5.90.0/scripts/upgrade.sh similarity index 100% rename from apps/ghost/5.89.6/scripts/upgrade.sh rename to apps/ghost/5.90.0/scripts/upgrade.sh From 30703e34ab217d8b3c1d8025af3d6d528bc4f19c Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 13:04:34 +0800 Subject: [PATCH 07/24] Update renovate.json --- .github/renovate.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index ec9c87d27..572b02b69 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -80,13 +80,8 @@ "allowedVersions": "/^4\\.8\\.\\d+\\.\\d+$/" }, { - "matchDatasources": [ - "docker" - ], - "matchPackageNames": [ - "photoprism/photoprism" - ], - "versioning": "loose" + "matchPackageNames": ["photoprism/photoprism"], + "versioning": "regex:^\\d{6}$" } ], "prCreation": "immediate" From ba2277326b5e39ef24892d89bbbfddb05f989dcc Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 13:07:03 +0800 Subject: [PATCH 08/24] Update renovate.json --- .github/renovate.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 572b02b69..c153b9d57 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -81,7 +81,11 @@ }, { "matchPackageNames": ["photoprism/photoprism"], - "versioning": "regex:^\\d{6}$" + "versioning": { + "type": "regex", + "regex": "^(\\d{2})(\\d{2})(\\d{2})$", + "labels": ["major", "minor", "patch"] + } } ], "prCreation": "immediate" From 9fc00e3344236f03f6d86067c0525c87c1bdc1cd Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 13:12:59 +0800 Subject: [PATCH 09/24] Update renovate.json --- .github/renovate.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index c153b9d57..69b136723 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -81,11 +81,7 @@ }, { "matchPackageNames": ["photoprism/photoprism"], - "versioning": { - "type": "regex", - "regex": "^(\\d{2})(\\d{2})(\\d{2})$", - "labels": ["major", "minor", "patch"] - } + "versioning": "regex:^(\\d{6})$" } ], "prCreation": "immediate" From 830ec951156ab20987e3e2bd65114b699758b249 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 13:15:09 +0800 Subject: [PATCH 10/24] Update renovate.json --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 69b136723..f7cbb45bf 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -81,7 +81,7 @@ }, { "matchPackageNames": ["photoprism/photoprism"], - "versioning": "regex:^(\\d{6})$" + "versioning": "regex:^(\\d{2})(\\d{2})(\\d{2})$" } ], "prCreation": "immediate" From c1a7e51d449859fa67a96ca261e4cb42e602dd4e Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 13:18:39 +0800 Subject: [PATCH 11/24] Update renovate.json --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index f7cbb45bf..7c4068d6d 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -81,7 +81,7 @@ }, { "matchPackageNames": ["photoprism/photoprism"], - "versioning": "regex:^(\\d{2})(\\d{2})(\\d{2})$" + "versioning": "regex:^(?\\d{2})(?\\d{2})(?\\d{2})$" } ], "prCreation": "immediate" From 2ec7b3e795bc0e10ac3a2055a547767ad1b05732 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 14:19:42 +0800 Subject: [PATCH 12/24] Update renovate.json --- .github/renovate.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 7c4068d6d..6f2bd259e 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -82,6 +82,11 @@ { "matchPackageNames": ["photoprism/photoprism"], "versioning": "regex:^(?\\d{2})(?\\d{2})(?\\d{2})$" + }, + { + "matchDatasources": ["docker"], + "matchPackageNames": ["ghcr.io/umami-software/umami"], + "versioning": "semver" } ], "prCreation": "immediate" From 15f6c8de98c36a3b07dcf033deaf9b44f8e249fa Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 14:28:12 +0800 Subject: [PATCH 13/24] Update renovate.json --- .github/renovate.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 6f2bd259e..07041b94a 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -84,9 +84,10 @@ "versioning": "regex:^(?\\d{2})(?\\d{2})(?\\d{2})$" }, { - "matchDatasources": ["docker"], - "matchPackageNames": ["ghcr.io/umami-software/umami"], - "versioning": "semver" + "fileMatch": ["^docker-compose.yml$"], + "matchStrings": ["image:\\s?ghcr\\.io/umami-software/umami:.+"], + "datasourceTemplate": "docker", + "extractVersionTemplate": "^${DATABASE_TYPE}-v(?[0-9]+\\.[0-9]+\\.[0-9]+)$" } ], "prCreation": "immediate" From 9a144eb85f426eb43aa5c87c4967e5b7cc0c73fc Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 14:30:02 +0800 Subject: [PATCH 14/24] Update renovate.json --- .github/renovate.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 07041b94a..b46abc8b2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -85,9 +85,8 @@ }, { "fileMatch": ["^docker-compose.yml$"], - "matchStrings": ["image:\\s?ghcr\\.io/umami-software/umami:.+"], - "datasourceTemplate": "docker", - "extractVersionTemplate": "^${DATABASE_TYPE}-v(?[0-9]+\\.[0-9]+\\.[0-9]+)$" + "matchStrings": ["image:\\s?ghcr\\.io/umami-software/umami:(?[0-9]+\\.[0-9]+\\.[0-9]+)"], + "datasourceTemplate": "docker" } ], "prCreation": "immediate" From 53f0bce3488f11d4f4e05858781ad4df261aea85 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Sat, 24 Aug 2024 14:32:41 +0800 Subject: [PATCH 15/24] Update renovate.json --- .github/renovate.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index b46abc8b2..f3ebe3d79 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -85,8 +85,11 @@ }, { "fileMatch": ["^docker-compose.yml$"], - "matchStrings": ["image:\\s?ghcr\\.io/umami-software/umami:(?[0-9]+\\.[0-9]+\\.[0-9]+)"], - "datasourceTemplate": "docker" + "matchStrings": [ + "image:\\s?ghcr\\.io/umami-software/umami:[^\\s]+" + ], + "datasourceTemplate": "docker", + "versioningTemplate": "docker" } ], "prCreation": "immediate" From 161845104f2d4863af538aed8cf5df991f28edfc Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 24 Aug 2024 14:48:45 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E5=88=86=E7=A6=BB=20Umami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 8 - .../2.12.1 => umami-mysql/2.13.0}/data.yml | 20 +-- apps/umami-mysql/2.13.0/docker-compose.yml | 25 +++ .../2.13.0}/scripts/init.sh | 0 .../2.13.0}/scripts/uninstall.sh | 0 .../2.13.0}/scripts/upgrade.sh | 0 apps/umami-mysql/README.md | 142 ++++++++++++++++++ apps/umami-mysql/data.yml | 20 +++ apps/umami-mysql/logo.png | Bin 0 -> 9458 bytes apps/umami/2.13.0/data.yml | 104 +++++++++++++ .../{2.12.1 => 2.13.0}/docker-compose.yml | 5 +- apps/umami/2.13.0/scripts/init.sh | 15 ++ apps/umami/2.13.0/scripts/uninstall.sh | 10 ++ apps/umami/2.13.0/scripts/upgrade.sh | 15 ++ apps/umami/README.md | 6 + apps/umami/data.yml | 2 +- 16 files changed, 344 insertions(+), 28 deletions(-) rename apps/{umami/2.12.1 => umami-mysql/2.13.0}/data.yml (84%) create mode 100644 apps/umami-mysql/2.13.0/docker-compose.yml rename apps/{umami/2.12.1 => umami-mysql/2.13.0}/scripts/init.sh (100%) rename apps/{umami/2.12.1 => umami-mysql/2.13.0}/scripts/uninstall.sh (100%) rename apps/{umami/2.12.1 => umami-mysql/2.13.0}/scripts/upgrade.sh (100%) create mode 100644 apps/umami-mysql/README.md create mode 100644 apps/umami-mysql/data.yml create mode 100644 apps/umami-mysql/logo.png create mode 100644 apps/umami/2.13.0/data.yml rename apps/umami/{2.12.1 => 2.13.0}/docker-compose.yml (67%) create mode 100644 apps/umami/2.13.0/scripts/init.sh create mode 100644 apps/umami/2.13.0/scripts/uninstall.sh create mode 100644 apps/umami/2.13.0/scripts/upgrade.sh diff --git a/.github/renovate.json b/.github/renovate.json index f3ebe3d79..7c4068d6d 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -82,14 +82,6 @@ { "matchPackageNames": ["photoprism/photoprism"], "versioning": "regex:^(?\\d{2})(?\\d{2})(?\\d{2})$" - }, - { - "fileMatch": ["^docker-compose.yml$"], - "matchStrings": [ - "image:\\s?ghcr\\.io/umami-software/umami:[^\\s]+" - ], - "datasourceTemplate": "docker", - "versioningTemplate": "docker" } ], "prCreation": "immediate" diff --git a/apps/umami/2.12.1/data.yml b/apps/umami-mysql/2.13.0/data.yml similarity index 84% rename from apps/umami/2.12.1/data.yml rename to apps/umami-mysql/2.13.0/data.yml index 7f3339e67..ec593ab70 100644 --- a/apps/umami/2.12.1/data.yml +++ b/apps/umami-mysql/2.13.0/data.yml @@ -5,16 +5,14 @@ additionalProperties: envKey: PANEL_DB_HOST required: true type: service - default: postgresql + default: mysql edit: true envKey: PANEL_DB_TYPE - labelZh: 数据库 服务 (前置检查) + labelZh: MySQL 服务 (前置检查) labelEn: Database Service (Pre-check) required: true type: apps values: - - label: PostgreSQL - value: postgresql - label: MySQL value: mysql - label: MariaDB @@ -71,18 +69,6 @@ additionalProperties: value: "1" - label: 关闭 value: "0" - - default: postgresql - edit: true - envKey: DATABASE_TYPE - labelZh: 数据库 类型 - labelEn: Database Type - required: true - type: select - values: - - label: PostgreSQL - value: postgresql - - label: MySQL (MariaDB, Percona) - value: mysql - default: "127.0.0.1" edit: true envKey: DB_HOSTNAME @@ -90,7 +76,7 @@ additionalProperties: labelEn: Database Host required: true type: text - - default: 5432 + - default: 3306 edit: true envKey: DB_PORT labelZh: 数据库 端口 diff --git a/apps/umami-mysql/2.13.0/docker-compose.yml b/apps/umami-mysql/2.13.0/docker-compose.yml new file mode 100644 index 000000000..4f8ef7b09 --- /dev/null +++ b/apps/umami-mysql/2.13.0/docker-compose.yml @@ -0,0 +1,25 @@ +version: "3.8" + +networks: + 1panel-network: + external: true + +services: + umami-mysql: + image: ghcr.io/umami-software/umami:mysql-v2.13.0 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:3000 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} + environment: + - DISABLE_TELEMETRY = 1 + - REMOVE_TRAILING_SLASH = 1 + - DATABASE_TYPE=mysql + - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} diff --git a/apps/umami/2.12.1/scripts/init.sh b/apps/umami-mysql/2.13.0/scripts/init.sh similarity index 100% rename from apps/umami/2.12.1/scripts/init.sh rename to apps/umami-mysql/2.13.0/scripts/init.sh diff --git a/apps/umami/2.12.1/scripts/uninstall.sh b/apps/umami-mysql/2.13.0/scripts/uninstall.sh similarity index 100% rename from apps/umami/2.12.1/scripts/uninstall.sh rename to apps/umami-mysql/2.13.0/scripts/uninstall.sh diff --git a/apps/umami/2.12.1/scripts/upgrade.sh b/apps/umami-mysql/2.13.0/scripts/upgrade.sh similarity index 100% rename from apps/umami/2.12.1/scripts/upgrade.sh rename to apps/umami-mysql/2.13.0/scripts/upgrade.sh diff --git a/apps/umami-mysql/README.md b/apps/umami-mysql/README.md new file mode 100644 index 000000000..75708657c --- /dev/null +++ b/apps/umami-mysql/README.md @@ -0,0 +1,142 @@ +# Umami MySQL版本 + +为速度和效率而构建的网站分析 + +Umami 网站分析提供您实时做出决策所需的数据。 + +![Umami](https://file.lifebus.top/imgs/umami_cover.jpg) + +![](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) + +## 简介 + +Umami 让您轻松分析数据 + ++ 便于使用 + +Umami 功能强大而简单，易于使用和理解，不需要复杂的设置或标签配置。 + ++ UTM 和自定义事件 + +Umami 会自动理解带有 UTM 参数的链接，并让您根据 UTM 查看和过滤您的网站数据。此外，您还可以跟踪网站上的任何事件，例如按钮点击、表单提交、购买、新闻通讯注册等。 + ++ 没有 Cookie 横幅 + +所有数据均经过 Umami 匿名处理，并且不会收集您网站用户的任何个人信息。您无需选择加入 Cookie +横幅即可跟踪网站的性能，从而为您的用户提供更好、更值得信赖的体验。 +默认情况下，Umami 符合 GDPRP 和 CCPA。 + +## 环境准备 + ++ 数据库支持 + + `MySQL` 版本：`5.7+` + + `PostgreSQL` 版本：`12.14+` + +## 安装说明 + +> 默认管理员帐户 +> +> 用户名： admin +> +> 密码： umami + +## 反向代理 + +> Nginx + +如果您的请求头中存在自定义字段，请修改： + +```text +add_header Access-Control-Allow-Headers '*' +``` + +以下配置修复 ipv6 地址无法收集的问题： + +```nginx +server { + ... + + add_header Content-Security-Policy 'frame-ancestors *'; + add_header Access-Control-Allow-Origin '*'; + add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; + add_header Access-Control-Allow-Headers 'x-umami-cache,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'; + if ($request_method = 'OPTIONS') { + return 204; + } + + location /api/send { + content_by_lua_block { + local cjson = require "cjson" + + local function is_ipv6_address(hostname) + local match = hostname:match("^[%x:]+$") + return match ~= nil + end + + ngx.req.read_body() + local data = ngx.req.get_body_data() + + if data then + local decoded_data = cjson.decode(data) + local hostname = decoded_data.payload.hostname + + if is_ipv6_address(hostname) then + local new_hostname = "127.0.0.1" + decoded_data.payload.hostname = new_hostname + + local modified_data = cjson.encode(decoded_data) + ngx.req.set_body_data(modified_data) + end + end + + ngx.exec("@proxy") + } + } + + location / { + proxy_hide_header 'Access-Control-Allow-Origin'; + proxy_hide_header 'Content-Security-Policy'; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://127.0.0.1:3000; + } + + location @proxy { + proxy_hide_header 'Access-Control-Allow-Origin'; + proxy_hide_header 'Content-Security-Policy'; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://127.0.0.1:3000; + } +} +``` + +极简配置： + +```nginx +add_header Content-Security-Policy 'frame-ancestors *'; +add_header Access-Control-Allow-Origin '*'; +add_header Access-Control-Allow-Methods '*'; +add_header Access-Control-Allow-Headers '*'; +if ($request_method = 'OPTIONS') { + return 204; +} + +location / { + proxy_hide_header 'Access-Control-Allow-Origin'; + proxy_hide_header 'Content-Security-Policy'; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://127.0.0.1:3000; +} +``` + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/umami-mysql/data.yml b/apps/umami-mysql/data.yml new file mode 100644 index 000000000..2bd8494b5 --- /dev/null +++ b/apps/umami-mysql/data.yml @@ -0,0 +1,20 @@ +name: Umami MySQL版 +title: Umami MySQL版 +description: 为速度和效率而构建的网站分析 +additionalProperties: + key: umami-mysql + name: Umami MySQL版 + tags: + - WebSite + - Database + - Middleware + - Runtime + - Local + shortDescZh: 为速度和效率而构建的网站分析 + shortDescEn: A website analytics tool that is built for speed and efficiency + type: website + crossVersionUpdate: true + limit: 0 + website: https://umami.is/ + github: https://github.com/umami-software/umami/ + document: https://umami.is/docs/ diff --git a/apps/umami-mysql/logo.png b/apps/umami-mysql/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..9ede937a0a16fab795ef4eef0c5656e4563d78e5 GIT binary patch literal 9458 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 .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/umami/2.13.0/scripts/uninstall.sh b/apps/umami/2.13.0/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/umami/2.13.0/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/umami/2.13.0/scripts/upgrade.sh b/apps/umami/2.13.0/scripts/upgrade.sh new file mode 100644 index 000000000..77b849120 --- /dev/null +++ b/apps/umami/2.13.0/scripts/upgrade.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/umami/README.md b/apps/umami/README.md index 56b5f00f0..41302725a 100644 --- a/apps/umami/README.md +++ b/apps/umami/README.md @@ -8,6 +8,12 @@ Umami 网站分析提供您实时做出决策所需的数据。 ![](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) +## 声明 + +> 该应用默认使用 `PostgreSQL` 作为基础数据库，原使用 `MySQL` 数据库的用户需要进行卸载重新安装 `MySQL` 版本。 +> +> 卸载重装请注意参数保持一致，持久化目录也必须保持一致。 + ## 简介 Umami 让您轻松分析数据 diff --git a/apps/umami/data.yml b/apps/umami/data.yml index b94e9cca2..190e8d30f 100644 --- a/apps/umami/data.yml +++ b/apps/umami/data.yml @@ -1,5 +1,5 @@ name: Umami -title: 为速度和效率而构建的网站分析 +title: Umami - 网站分析 description: 为速度和效率而构建的网站分析 additionalProperties: key: umami From 4ee071c530ef85b55c16730d5be9630c230d2ba1 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 24 Aug 2024 14:53:58 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=88=86=E7=A6=BB=20Umami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 7c4068d6d..6befca7fd 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -82,6 +82,11 @@ { "matchPackageNames": ["photoprism/photoprism"], "versioning": "regex:^(?\\d{2})(?\\d{2})(?\\d{2})$" + }, + { + "matchDatasources": ["docker"], + "matchPackageNames": ["ghcr.io/umami-software/umami"], + "versioning": "docker" } ], "prCreation": "immediate" From 1f0b8afd4dc7b493b3fd91824573222de630c09d Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 24 Aug 2024 15:14:25 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E5=88=86=E7=A6=BB=20Umami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 45 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 6befca7fd..2ff7d6c80 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -80,12 +80,51 @@ "allowedVersions": "/^4\\.8\\.\\d+\\.\\d+$/" }, { - "matchPackageNames": ["photoprism/photoprism"], + "matchPackageNames": [ + "photoprism/photoprism" + ], "versioning": "regex:^(?\\d{2})(?\\d{2})(?\\d{2})$" }, { - "matchDatasources": ["docker"], - "matchPackageNames": ["ghcr.io/umami-software/umami"], + "matchDatasources": [ + "docker" + ], + "matchPackageNames": [ + "ghcr.io/umami-software/umami" + ], + "versioning": "docker" + }, + { + "matchDatasources": [ + "docker" + ], + "matchPackageNames": [ + "ghcr.io/umami-software/*" + ], + "versioning": "docker" + }, + { + "matchDatasources": [ + "docker" + ], + "matchPackageNames": [ + "ghcr.io/umami-software/umami" + ], + "matchVersions": [ + "^postgresql-v" + ], + "versioning": "docker" + }, + { + "matchDatasources": [ + "docker" + ], + "matchPackageNames": [ + "ghcr.io/umami-software/umami" + ], + "matchVersions": [ + "^mysql-v" + ], "versioning": "docker" } ], From 27c85c43823fbc57f93f67ed5b80ac847a492451 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 24 Aug 2024 15:38:06 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E5=88=86=E7=A6=BB=20Umami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 2ff7d6c80..a1337a59a 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -102,30 +102,6 @@ "ghcr.io/umami-software/*" ], "versioning": "docker" - }, - { - "matchDatasources": [ - "docker" - ], - "matchPackageNames": [ - "ghcr.io/umami-software/umami" - ], - "matchVersions": [ - "^postgresql-v" - ], - "versioning": "docker" - }, - { - "matchDatasources": [ - "docker" - ], - "matchPackageNames": [ - "ghcr.io/umami-software/umami" - ], - "matchVersions": [ - "^mysql-v" - ], - "versioning": "docker" } ], "prCreation": "immediate" From eaa9c23c66b6946556918245cab456802d2660df Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 24 Aug 2024 16:16:55 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20Umami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/umami-mysql/{2.13.0 => 2.13.1}/data.yml | 0 apps/umami-mysql/{2.13.0 => 2.13.1}/docker-compose.yml | 2 +- apps/umami-mysql/{2.13.0 => 2.13.1}/scripts/init.sh | 0 apps/umami-mysql/{2.13.0 => 2.13.1}/scripts/uninstall.sh | 0 apps/umami-mysql/{2.13.0 => 2.13.1}/scripts/upgrade.sh | 0 apps/umami/{2.13.0 => 2.13.1}/data.yml | 0 apps/umami/{2.13.0 => 2.13.1}/docker-compose.yml | 2 +- apps/umami/{2.13.0 => 2.13.1}/scripts/init.sh | 0 apps/umami/{2.13.0 => 2.13.1}/scripts/uninstall.sh | 0 apps/umami/{2.13.0 => 2.13.1}/scripts/upgrade.sh | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename apps/umami-mysql/{2.13.0 => 2.13.1}/data.yml (100%) rename apps/umami-mysql/{2.13.0 => 2.13.1}/docker-compose.yml (91%) rename apps/umami-mysql/{2.13.0 => 2.13.1}/scripts/init.sh (100%) rename apps/umami-mysql/{2.13.0 => 2.13.1}/scripts/uninstall.sh (100%) rename apps/umami-mysql/{2.13.0 => 2.13.1}/scripts/upgrade.sh (100%) rename apps/umami/{2.13.0 => 2.13.1}/data.yml (100%) rename apps/umami/{2.13.0 => 2.13.1}/docker-compose.yml (90%) rename apps/umami/{2.13.0 => 2.13.1}/scripts/init.sh (100%) rename apps/umami/{2.13.0 => 2.13.1}/scripts/uninstall.sh (100%) rename apps/umami/{2.13.0 => 2.13.1}/scripts/upgrade.sh (100%) diff --git a/apps/umami-mysql/2.13.0/data.yml b/apps/umami-mysql/2.13.1/data.yml similarity index 100% rename from apps/umami-mysql/2.13.0/data.yml rename to apps/umami-mysql/2.13.1/data.yml diff --git a/apps/umami-mysql/2.13.0/docker-compose.yml b/apps/umami-mysql/2.13.1/docker-compose.yml similarity index 91% rename from apps/umami-mysql/2.13.0/docker-compose.yml rename to apps/umami-mysql/2.13.1/docker-compose.yml index 4f8ef7b09..b9dfe3edd 100644 --- a/apps/umami-mysql/2.13.0/docker-compose.yml +++ b/apps/umami-mysql/2.13.1/docker-compose.yml @@ -6,7 +6,7 @@ networks: services: umami-mysql: - image: ghcr.io/umami-software/umami:mysql-v2.13.0 + image: ghcr.io/umami-software/umami:mysql-v2.13.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/umami-mysql/2.13.0/scripts/init.sh b/apps/umami-mysql/2.13.1/scripts/init.sh similarity index 100% rename from apps/umami-mysql/2.13.0/scripts/init.sh rename to apps/umami-mysql/2.13.1/scripts/init.sh diff --git a/apps/umami-mysql/2.13.0/scripts/uninstall.sh b/apps/umami-mysql/2.13.1/scripts/uninstall.sh similarity index 100% rename from apps/umami-mysql/2.13.0/scripts/uninstall.sh rename to apps/umami-mysql/2.13.1/scripts/uninstall.sh diff --git a/apps/umami-mysql/2.13.0/scripts/upgrade.sh b/apps/umami-mysql/2.13.1/scripts/upgrade.sh similarity index 100% rename from apps/umami-mysql/2.13.0/scripts/upgrade.sh rename to apps/umami-mysql/2.13.1/scripts/upgrade.sh diff --git a/apps/umami/2.13.0/data.yml b/apps/umami/2.13.1/data.yml similarity index 100% rename from apps/umami/2.13.0/data.yml rename to apps/umami/2.13.1/data.yml diff --git a/apps/umami/2.13.0/docker-compose.yml b/apps/umami/2.13.1/docker-compose.yml similarity index 90% rename from apps/umami/2.13.0/docker-compose.yml rename to apps/umami/2.13.1/docker-compose.yml index d3ea95acf..4d2c2e7c1 100644 --- a/apps/umami/2.13.0/docker-compose.yml +++ b/apps/umami/2.13.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: umami: - image: ghcr.io/umami-software/umami:postgresql-v2.13.0 + image: ghcr.io/umami-software/umami:postgresql-v2.13.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/umami/2.13.0/scripts/init.sh b/apps/umami/2.13.1/scripts/init.sh similarity index 100% rename from apps/umami/2.13.0/scripts/init.sh rename to apps/umami/2.13.1/scripts/init.sh diff --git a/apps/umami/2.13.0/scripts/uninstall.sh b/apps/umami/2.13.1/scripts/uninstall.sh similarity index 100% rename from apps/umami/2.13.0/scripts/uninstall.sh rename to apps/umami/2.13.1/scripts/uninstall.sh diff --git a/apps/umami/2.13.0/scripts/upgrade.sh b/apps/umami/2.13.1/scripts/upgrade.sh similarity index 100% rename from apps/umami/2.13.0/scripts/upgrade.sh rename to apps/umami/2.13.1/scripts/upgrade.sh From c26f91142c3ec99ed38d28e51145a45773fda253 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 02:24:25 +0000 Subject: [PATCH 21/24] Update 1dev/server Docker tag to v11.0.7 --- apps/onedev/11.0.6/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/onedev/11.0.6/docker-compose.yml b/apps/onedev/11.0.6/docker-compose.yml index 7f38be1fe..bf09ec8dd 100644 --- a/apps/onedev/11.0.6/docker-compose.yml +++ b/apps/onedev/11.0.6/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: onedev: - image: 1dev/server:11.0.6 + image: 1dev/server:11.0.7 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 3261f86f1cfb8824fa74067a7c926b446f873b74 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 25 Aug 2024 02:24:36 +0000 Subject: [PATCH 22/24] Update app version [skip ci] --- apps/onedev/{11.0.6 => 11.0.7}/data.yml | 0 apps/onedev/{11.0.6 => 11.0.7}/docker-compose.yml | 0 apps/onedev/{11.0.6 => 11.0.7}/scripts/init.sh | 0 apps/onedev/{11.0.6 => 11.0.7}/scripts/uninstall.sh | 0 apps/onedev/{11.0.6 => 11.0.7}/scripts/upgrade.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename apps/onedev/{11.0.6 => 11.0.7}/data.yml (100%) rename apps/onedev/{11.0.6 => 11.0.7}/docker-compose.yml (100%) rename apps/onedev/{11.0.6 => 11.0.7}/scripts/init.sh (100%) rename apps/onedev/{11.0.6 => 11.0.7}/scripts/uninstall.sh (100%) rename apps/onedev/{11.0.6 => 11.0.7}/scripts/upgrade.sh (100%) diff --git a/apps/onedev/11.0.6/data.yml b/apps/onedev/11.0.7/data.yml similarity index 100% rename from apps/onedev/11.0.6/data.yml rename to apps/onedev/11.0.7/data.yml diff --git a/apps/onedev/11.0.6/docker-compose.yml b/apps/onedev/11.0.7/docker-compose.yml similarity index 100% rename from apps/onedev/11.0.6/docker-compose.yml rename to apps/onedev/11.0.7/docker-compose.yml diff --git a/apps/onedev/11.0.6/scripts/init.sh b/apps/onedev/11.0.7/scripts/init.sh similarity index 100% rename from apps/onedev/11.0.6/scripts/init.sh rename to apps/onedev/11.0.7/scripts/init.sh diff --git a/apps/onedev/11.0.6/scripts/uninstall.sh b/apps/onedev/11.0.7/scripts/uninstall.sh similarity index 100% rename from apps/onedev/11.0.6/scripts/uninstall.sh rename to apps/onedev/11.0.7/scripts/uninstall.sh diff --git a/apps/onedev/11.0.6/scripts/upgrade.sh b/apps/onedev/11.0.7/scripts/upgrade.sh similarity index 100% rename from apps/onedev/11.0.6/scripts/upgrade.sh rename to apps/onedev/11.0.7/scripts/upgrade.sh From 1fb3301365afd1744e9427965f3570b072226e16 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 10:24:32 +0000 Subject: [PATCH 23/24] Update jellyfin/jellyfin Docker tag to v10.9.10 --- apps/jellyfin/10.9.9/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/jellyfin/10.9.9/docker-compose.yml b/apps/jellyfin/10.9.9/docker-compose.yml index 449468b96..379f1aa51 100644 --- a/apps/jellyfin/10.9.9/docker-compose.yml +++ b/apps/jellyfin/10.9.9/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: jellyfin: - image: jellyfin/jellyfin:10.9.9 + image: jellyfin/jellyfin:10.9.10 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From ab31f48e6d0dd171b82d2b5e7d02e9b1bb42b486 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 25 Aug 2024 10:24:43 +0000 Subject: [PATCH 24/24] Update app version [skip ci] --- apps/jellyfin/{10.9.9 => 10.9.10}/data.yml | 0 apps/jellyfin/{10.9.9 => 10.9.10}/docker-compose.yml | 0 apps/jellyfin/{10.9.9 => 10.9.10}/scripts/init.sh | 0 apps/jellyfin/{10.9.9 => 10.9.10}/scripts/uninstall.sh | 0 apps/jellyfin/{10.9.9 => 10.9.10}/scripts/upgrade.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename apps/jellyfin/{10.9.9 => 10.9.10}/data.yml (100%) rename apps/jellyfin/{10.9.9 => 10.9.10}/docker-compose.yml (100%) rename apps/jellyfin/{10.9.9 => 10.9.10}/scripts/init.sh (100%) rename apps/jellyfin/{10.9.9 => 10.9.10}/scripts/uninstall.sh (100%) rename apps/jellyfin/{10.9.9 => 10.9.10}/scripts/upgrade.sh (100%) diff --git a/apps/jellyfin/10.9.9/data.yml b/apps/jellyfin/10.9.10/data.yml similarity index 100% rename from apps/jellyfin/10.9.9/data.yml rename to apps/jellyfin/10.9.10/data.yml diff --git a/apps/jellyfin/10.9.9/docker-compose.yml b/apps/jellyfin/10.9.10/docker-compose.yml similarity index 100% rename from apps/jellyfin/10.9.9/docker-compose.yml rename to apps/jellyfin/10.9.10/docker-compose.yml diff --git a/apps/jellyfin/10.9.9/scripts/init.sh b/apps/jellyfin/10.9.10/scripts/init.sh similarity index 100% rename from apps/jellyfin/10.9.9/scripts/init.sh rename to apps/jellyfin/10.9.10/scripts/init.sh diff --git a/apps/jellyfin/10.9.9/scripts/uninstall.sh b/apps/jellyfin/10.9.10/scripts/uninstall.sh similarity index 100% rename from apps/jellyfin/10.9.9/scripts/uninstall.sh rename to apps/jellyfin/10.9.10/scripts/uninstall.sh diff --git a/apps/jellyfin/10.9.9/scripts/upgrade.sh b/apps/jellyfin/10.9.10/scripts/upgrade.sh similarity index 100% rename from apps/jellyfin/10.9.9/scripts/upgrade.sh rename to apps/jellyfin/10.9.10/scripts/upgrade.sh