From 958bb6c24489023a39d4e2d1aff611bea311af3c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 08:04:42 +0000 Subject: [PATCH 01/29] Update nacos/nacos-server Docker tag to v2.4.3 --- apps/nacos/2.4.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nacos/2.4.0/docker-compose.yml b/apps/nacos/2.4.0/docker-compose.yml index 6b20d8ac..f574f587 100644 --- a/apps/nacos/2.4.0/docker-compose.yml +++ b/apps/nacos/2.4.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nacos: - image: nacos/nacos-server:v2.4.0 + image: nacos/nacos-server:v2.4.3 container_name: ${CONTAINER_NAME} restart: always labels: From bc756bc817556a66328db1f4002d924813ab319d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 22 Jan 2025 08:04:54 +0000 Subject: [PATCH 02/29] Update app version [skip ci] --- apps/nacos/{2.4.0 => 2.4.3}/data.yml | 0 apps/nacos/{2.4.0 => 2.4.3}/docker-compose.yml | 0 apps/nacos/{2.4.0 => 2.4.3}/envs/default.env | 0 apps/nacos/{2.4.0 => 2.4.3}/envs/global.env | 0 apps/nacos/{2.4.0 => 2.4.3}/init/mysql-schema.sql | 0 apps/nacos/{2.4.0 => 2.4.3}/scripts/init.sh | 0 apps/nacos/{2.4.0 => 2.4.3}/scripts/uninstall.sh | 0 apps/nacos/{2.4.0 => 2.4.3}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/nacos/{2.4.0 => 2.4.3}/data.yml (100%) rename apps/nacos/{2.4.0 => 2.4.3}/docker-compose.yml (100%) rename apps/nacos/{2.4.0 => 2.4.3}/envs/default.env (100%) rename apps/nacos/{2.4.0 => 2.4.3}/envs/global.env (100%) rename apps/nacos/{2.4.0 => 2.4.3}/init/mysql-schema.sql (100%) rename apps/nacos/{2.4.0 => 2.4.3}/scripts/init.sh (100%) rename apps/nacos/{2.4.0 => 2.4.3}/scripts/uninstall.sh (100%) rename apps/nacos/{2.4.0 => 2.4.3}/scripts/upgrade.sh (100%) diff --git a/apps/nacos/2.4.0/data.yml b/apps/nacos/2.4.3/data.yml similarity index 100% rename from apps/nacos/2.4.0/data.yml rename to apps/nacos/2.4.3/data.yml diff --git a/apps/nacos/2.4.0/docker-compose.yml b/apps/nacos/2.4.3/docker-compose.yml similarity index 100% rename from apps/nacos/2.4.0/docker-compose.yml rename to apps/nacos/2.4.3/docker-compose.yml diff --git a/apps/nacos/2.4.0/envs/default.env b/apps/nacos/2.4.3/envs/default.env similarity index 100% rename from apps/nacos/2.4.0/envs/default.env rename to apps/nacos/2.4.3/envs/default.env diff --git a/apps/nacos/2.4.0/envs/global.env b/apps/nacos/2.4.3/envs/global.env similarity index 100% rename from apps/nacos/2.4.0/envs/global.env rename to apps/nacos/2.4.3/envs/global.env diff --git a/apps/nacos/2.4.0/init/mysql-schema.sql b/apps/nacos/2.4.3/init/mysql-schema.sql similarity index 100% rename from apps/nacos/2.4.0/init/mysql-schema.sql rename to apps/nacos/2.4.3/init/mysql-schema.sql diff --git a/apps/nacos/2.4.0/scripts/init.sh b/apps/nacos/2.4.3/scripts/init.sh similarity index 100% rename from apps/nacos/2.4.0/scripts/init.sh rename to apps/nacos/2.4.3/scripts/init.sh diff --git a/apps/nacos/2.4.0/scripts/uninstall.sh b/apps/nacos/2.4.3/scripts/uninstall.sh similarity index 100% rename from apps/nacos/2.4.0/scripts/uninstall.sh rename to apps/nacos/2.4.3/scripts/uninstall.sh diff --git a/apps/nacos/2.4.0/scripts/upgrade.sh b/apps/nacos/2.4.3/scripts/upgrade.sh similarity index 100% rename from apps/nacos/2.4.0/scripts/upgrade.sh rename to apps/nacos/2.4.3/scripts/upgrade.sh From 384d98f6951d3b023a3a8b2fd40ba266b3000ce0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:07:04 +0000 Subject: [PATCH 03/29] Update casbin/casdoor Docker tag to v1.812.0 --- apps/casdoor/1.811.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/casdoor/1.811.0/docker-compose.yml b/apps/casdoor/1.811.0/docker-compose.yml index 597ac967..0057e688 100644 --- a/apps/casdoor/1.811.0/docker-compose.yml +++ b/apps/casdoor/1.811.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v1.811.0 + image: casbin/casdoor:v1.812.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From c0159a40150b99d108fa601c5e5f48d5a3f29015 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 22 Jan 2025 09:07:16 +0000 Subject: [PATCH 04/29] Update app version [skip ci] --- apps/casdoor/{1.811.0 => 1.812.0}/config/init_data.json | 0 apps/casdoor/{1.811.0 => 1.812.0}/data.yml | 0 apps/casdoor/{1.811.0 => 1.812.0}/docker-compose.yml | 0 apps/casdoor/{1.811.0 => 1.812.0}/envs/casdoor.env | 0 apps/casdoor/{1.811.0 => 1.812.0}/envs/default.env | 0 apps/casdoor/{1.811.0 => 1.812.0}/envs/global.env | 0 apps/casdoor/{1.811.0 => 1.812.0}/scripts/init.sh | 0 apps/casdoor/{1.811.0 => 1.812.0}/scripts/uninstall.sh | 0 apps/casdoor/{1.811.0 => 1.812.0}/scripts/upgrade.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename apps/casdoor/{1.811.0 => 1.812.0}/config/init_data.json (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/data.yml (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/docker-compose.yml (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/envs/casdoor.env (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/envs/default.env (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/envs/global.env (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/scripts/init.sh (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/scripts/uninstall.sh (100%) rename apps/casdoor/{1.811.0 => 1.812.0}/scripts/upgrade.sh (100%) diff --git a/apps/casdoor/1.811.0/config/init_data.json b/apps/casdoor/1.812.0/config/init_data.json similarity index 100% rename from apps/casdoor/1.811.0/config/init_data.json rename to apps/casdoor/1.812.0/config/init_data.json diff --git a/apps/casdoor/1.811.0/data.yml b/apps/casdoor/1.812.0/data.yml similarity index 100% rename from apps/casdoor/1.811.0/data.yml rename to apps/casdoor/1.812.0/data.yml diff --git a/apps/casdoor/1.811.0/docker-compose.yml b/apps/casdoor/1.812.0/docker-compose.yml similarity index 100% rename from apps/casdoor/1.811.0/docker-compose.yml rename to apps/casdoor/1.812.0/docker-compose.yml diff --git a/apps/casdoor/1.811.0/envs/casdoor.env b/apps/casdoor/1.812.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/1.811.0/envs/casdoor.env rename to apps/casdoor/1.812.0/envs/casdoor.env diff --git a/apps/casdoor/1.811.0/envs/default.env b/apps/casdoor/1.812.0/envs/default.env similarity index 100% rename from apps/casdoor/1.811.0/envs/default.env rename to apps/casdoor/1.812.0/envs/default.env diff --git a/apps/casdoor/1.811.0/envs/global.env b/apps/casdoor/1.812.0/envs/global.env similarity index 100% rename from apps/casdoor/1.811.0/envs/global.env rename to apps/casdoor/1.812.0/envs/global.env diff --git a/apps/casdoor/1.811.0/scripts/init.sh b/apps/casdoor/1.812.0/scripts/init.sh similarity index 100% rename from apps/casdoor/1.811.0/scripts/init.sh rename to apps/casdoor/1.812.0/scripts/init.sh diff --git a/apps/casdoor/1.811.0/scripts/uninstall.sh b/apps/casdoor/1.812.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/1.811.0/scripts/uninstall.sh rename to apps/casdoor/1.812.0/scripts/uninstall.sh diff --git a/apps/casdoor/1.811.0/scripts/upgrade.sh b/apps/casdoor/1.812.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/1.811.0/scripts/upgrade.sh rename to apps/casdoor/1.812.0/scripts/upgrade.sh From d4e17a11ed65b1359d4c7cb8c75f31a30bf2913c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Wed, 22 Jan 2025 09:19:32 +0000 Subject: [PATCH 05/29] Processed apps directory via GitHub Actions --- appstore/nacos/2.4.3/.env | 66 ++++++ appstore/nacos/2.4.3/data.yml | 185 +++++++++++++++++ appstore/nacos/2.4.3/docker-compose.yml | 26 +++ appstore/nacos/2.4.3/envs/default.env | 2 + appstore/nacos/2.4.3/envs/global.env | 2 + appstore/nacos/2.4.3/init/mysql-schema.sql | 227 ++++++++++++++++++++ appstore/nacos/2.4.3/scripts/init.sh | 26 +++ appstore/nacos/2.4.3/scripts/uninstall.sh | 10 + appstore/nacos/2.4.3/scripts/upgrade.sh | 17 ++ appstore/nacos/2.5.0/init/mysql-schema.sql | 114 +++++----- appstore/nacos/README.md | 34 +++ dockge/nacos/docker-compose.yml | 2 +- dockge/nacos_2_5_0/.env | 66 ++++++ dockge/nacos_2_5_0/docker-compose.yml | 26 +++ dockge/nacos_2_5_0/envs/default.env | 2 + dockge/nacos_2_5_0/envs/global.env | 2 + dockge/nacos_2_5_0/init/mysql-schema.sql | 231 +++++++++++++++++++++ 17 files changed, 982 insertions(+), 56 deletions(-) create mode 100644 appstore/nacos/2.4.3/.env create mode 100644 appstore/nacos/2.4.3/data.yml create mode 100644 appstore/nacos/2.4.3/docker-compose.yml create mode 100644 appstore/nacos/2.4.3/envs/default.env create mode 100644 appstore/nacos/2.4.3/envs/global.env create mode 100644 appstore/nacos/2.4.3/init/mysql-schema.sql create mode 100644 appstore/nacos/2.4.3/scripts/init.sh create mode 100644 appstore/nacos/2.4.3/scripts/uninstall.sh create mode 100644 appstore/nacos/2.4.3/scripts/upgrade.sh create mode 100644 dockge/nacos_2_5_0/.env create mode 100644 dockge/nacos_2_5_0/docker-compose.yml create mode 100644 dockge/nacos_2_5_0/envs/default.env create mode 100644 dockge/nacos_2_5_0/envs/global.env create mode 100644 dockge/nacos_2_5_0/init/mysql-schema.sql diff --git a/appstore/nacos/2.4.3/.env b/appstore/nacos/2.4.3/.env new file mode 100644 index 00000000..25c02493 --- /dev/null +++ b/appstore/nacos/2.4.3/.env @@ -0,0 +1,66 @@ +# MySQL 服务 (前置检查) [必填] +PANEL_DB_TYPE=mysql + +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +NACOS_ROOT_PATH=/home/nacos + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8848 + +# Nacos gRPC 客户端端口 [必填] +PANEL_APP_PORT_GRPC_CLIENT=9848 + +# Nacos gRPC 服务端端口 [必填] +PANEL_APP_PORT_GRPC_SERVER=9849 + +# IP模式/域名模式 [必填] +PREFER_HOST_MODE=ip + +# 服务IP [必填] +NACOS_SERVER_IP= + +# Nacos身份验证密钥键 [必填] +NACOS_AUTH_IDENTITY_KEY=serverIdentity + +# Nacos身份验证密钥值 [必填] +NACOS_AUTH_IDENTITY_VALUE=security + +# Nacos身份验证令牌（至少32位字符的Base64编码） [必填] +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 + +# JVM_XMS (初始内存大小) [必填] +JVM_XMS=512m + +# JVM_XMX (最大内存大小) [必填] +JVM_XMX=2g + +# JVM_XMN (新生代内存) [必填] +JVM_XMN=128m + +# JVM_MS (初始元空间大小) [必填] +JVM_MS=128m + +# JVM_MMS (最大元空间大小) [必填] +JVM_MMS=320m + +# 数据库 主机 [必填] +MYSQL_SERVICE_HOST=127.0.0.1 + +# 数据库 端口 [必填] +MYSQL_SERVICE_PORT=3306 + +# 数据库 用户名 [必填] +MYSQL_SERVICE_USER=nacos + +# 数据库 密码 [必填] +MYSQL_SERVICE_PASSWORD= + +# 数据库 名称 [必填] +MYSQL_SERVICE_DB_NAME=nacos + +# 数据库 连接参数 [必填] +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + diff --git a/appstore/nacos/2.4.3/data.yml b/appstore/nacos/2.4.3/data.yml new file mode 100644 index 00000000..e60115e2 --- /dev/null +++ b/appstore/nacos/2.4.3/data.yml @@ -0,0 +1,185 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_DB_HOST + required: true + type: service + default: mysql + edit: true + envKey: PANEL_DB_TYPE + labelZh: MySQL 服务 (前置检查) + labelEn: Database Service (Pre-check) + required: true + type: apps + values: + - label: MySQL + value: mysql + - label: MariaDB + value: mariadb + - label: Percona + value: percona + - default: "host" + edit: true + envKey: NETWORK_MODE + labelEn: Drive path + labelZh: 网络模式 + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: "/home/nacos" + edit: true + envKey: NACOS_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8848 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 9848 + edit: true + envKey: PANEL_APP_PORT_GRPC_CLIENT + labelZh: Nacos gRPC 客户端端口 + labelEn: Nacos gRPC client port + required: true + rule: paramPort + type: number + - default: 9849 + edit: true + envKey: PANEL_APP_PORT_GRPC_SERVER + labelZh: Nacos gRPC 服务端端口 + labelEn: Nacos gRPC server port + required: true + rule: paramPort + type: number + - default: "ip" + envKey: PREFER_HOST_MODE + labelZh: IP模式/域名模式 + labelEn: IP mode/hostname mode + required: true + type: select + values: + - label: IP模式 + value: "ip" + - label: 域名模式 + value: "hostname" + - default: "" + edit: true + envKey: NACOS_SERVER_IP + labelZh: 服务IP + labelEn: Server IP + required: true + type: text + - default: "serverIdentity" + edit: true + envKey: NACOS_AUTH_IDENTITY_KEY + labelZh: Nacos身份验证密钥键 + labelEn: Nacos auth identity key + required: true + type: text + - default: "security" + edit: true + envKey: NACOS_AUTH_IDENTITY_VALUE + labelZh: Nacos身份验证密钥值 + labelEn: Nacos auth identity value + required: true + type: text + - default: "SecretKey012345678901234567890123456789012345678901234567890123456789" + edit: true + envKey: NACOS_AUTH_TOKEN + labelZh: Nacos身份验证令牌（至少32位字符的Base64编码） + labelEn: Nacos auth token + required: true + type: text + - default: "512m" + edit: true + envKey: JVM_XMS + labelZh: JVM_XMS (初始内存大小) + labelEn: JVM_XMS (Initial memory size) + required: true + type: text + - default: "2g" + edit: true + envKey: JVM_XMX + labelEn: JVM_XMX (Maximum memory size) + labelZh: JVM_XMX (最大内存大小) + required: true + type: text + - default: "128m" + edit: true + envKey: JVM_XMN + labelEn: JVM_XMN (New generation memory) + labelZh: JVM_XMN (新生代内存) + required: true + type: text + - default: "128m" + edit: true + envKey: JVM_MS + labelEn: JVM_MS (Initial metaspace) + labelZh: JVM_MS (初始元空间大小) + required: true + type: text + - default: "320m" + edit: true + envKey: JVM_MMS + labelEn: JVM_MMS (Maximum metaspace) + labelZh: JVM_MMS (最大元空间大小) + required: true + type: text + - default: "127.0.0.1" + edit: true + envKey: MYSQL_SERVICE_HOST + labelZh: 数据库 主机 + labelEn: Database Host + required: true + type: text + - default: 3306 + edit: true + envKey: MYSQL_SERVICE_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: true + rule: paramPort + type: number + - default: "nacos" + edit: true + envKey: MYSQL_SERVICE_USER + labelZh: 数据库 用户名 + labelEn: Database Username + required: true + type: text + - default: "" + edit: true + envKey: MYSQL_SERVICE_PASSWORD + labelZh: 数据库 密码 + labelEn: Database Password + required: true + type: password + - default: "nacos" + edit: true + envKey: MYSQL_SERVICE_DB_NAME + labelZh: 数据库 名称 + labelEn: Database Name + required: true + type: text + - default: "characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true" + edit: true + envKey: MYSQL_SERVICE_DB_PARAM + labelZh: 数据库 连接参数 + labelEn: Database Connection Parameters + required: true + type: text diff --git a/appstore/nacos/2.4.3/docker-compose.yml b/appstore/nacos/2.4.3/docker-compose.yml new file mode 100644 index 00000000..a2dd1ec2 --- /dev/null +++ b/appstore/nacos/2.4.3/docker-compose.yml @@ -0,0 +1,26 @@ +networks: + 1panel-network: + external: true +services: + nacos: + container_name: nacos + env_file: + - ./envs/global.env + - .env + environment: + - MODE=standalone + - NACOS_SERVER_PORT=8848 + - NACOS_AUTH_ENABLE=true + - SPRING_DATASOURCE_PLATFORM=mysql + image: nacos/nacos-server:v2.4.3 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:8848 + - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 + - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + restart: always + volumes: + - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs + - ${NACOS_ROOT_PATH}/data:/home/nacos/data diff --git a/appstore/nacos/2.4.3/envs/default.env b/appstore/nacos/2.4.3/envs/default.env new file mode 100644 index 00000000..cd05f46e --- /dev/null +++ b/appstore/nacos/2.4.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/appstore/nacos/2.4.3/envs/global.env b/appstore/nacos/2.4.3/envs/global.env new file mode 100644 index 00000000..e10989fe --- /dev/null +++ b/appstore/nacos/2.4.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/appstore/nacos/2.4.3/init/mysql-schema.sql b/appstore/nacos/2.4.3/init/mysql-schema.sql new file mode 100644 index 00000000..067d67a1 --- /dev/null +++ b/appstore/nacos/2.4.3/init/mysql-schema.sql @@ -0,0 +1,227 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******************************************/ +/* 表名称 = config_info */ +/******************************************/ +CREATE TABLE `config_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `c_schema` text COMMENT '配置的模式', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; + +/******************************************/ +/* 表名称 = config_info_aggr */ +/******************************************/ +CREATE TABLE `config_info_aggr` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + +/******************************************/ +/* 表名称 = config_tags_relation */ +/******************************************/ +CREATE TABLE `config_tags_relation` +( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增长标识', + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; + +/******************************************/ +/* 表名称 = group_capacity */ +/******************************************/ +CREATE TABLE `group_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; + +/******************************************/ +/* 表名称 = his_config_info */ +/******************************************/ +CREATE TABLE `his_config_info` +( + `id` bigint(20) unsigned NOT NULL COMMENT 'id', + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + + +/******************************************/ +/* 表名称 = tenant_capacity */ +/******************************************/ +CREATE TABLE `tenant_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; + + +CREATE TABLE `tenant_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) default '' COMMENT 'tenant_id', + `tenant_name` varchar(128) default '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE `users` +( + `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', + `password` varchar(500) NOT NULL COMMENT 'password', + `enabled` boolean NOT NULL COMMENT 'enabled' +); + +CREATE TABLE `roles` +( + `username` varchar(50) NOT NULL COMMENT 'username', + `role` varchar(50) NOT NULL COMMENT 'role', + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE +); + +CREATE TABLE `permissions` +( + `role` varchar(50) NOT NULL COMMENT 'role', + `resource` varchar(128) NOT NULL COMMENT 'resource', + `action` varchar(8) NOT NULL COMMENT 'action', + UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/appstore/nacos/2.4.3/scripts/init.sh b/appstore/nacos/2.4.3/scripts/init.sh new file mode 100644 index 00000000..19193ac7 --- /dev/null +++ b/appstore/nacos/2.4.3/scripts/init.sh @@ -0,0 +1,26 @@ +#!/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 + + if command -v mysql &> /dev/null; then + if [[ -f ./init/mysql-schema.sql ]]; then + mysql -u"$MYSQL_SERVICE_USER" -p"$MYSQL_SERVICE_PASSWORD" -h"$MYSQL_SERVICE_HOST" -P"$MYSQL_SERVICE_PORT" --protocol=TCP "$MYSQL_SERVICE_DB_NAME" < ./init/mysql-schema.sql + else + echo "mysql-schema.sql not found." + fi + else + echo "mysql command not found." + fi + + echo "Check Finish." +else + echo "Error: .env file not found." +fi diff --git a/appstore/nacos/2.4.3/scripts/uninstall.sh b/appstore/nacos/2.4.3/scripts/uninstall.sh new file mode 100644 index 00000000..c86c4fbc --- /dev/null +++ b/appstore/nacos/2.4.3/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/appstore/nacos/2.4.3/scripts/upgrade.sh b/appstore/nacos/2.4.3/scripts/upgrade.sh new file mode 100644 index 00000000..07fb8c3f --- /dev/null +++ b/appstore/nacos/2.4.3/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/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/nacos/2.5.0/init/mysql-schema.sql b/appstore/nacos/2.5.0/init/mysql-schema.sql index 067d67a1..e591aa98 100644 --- a/appstore/nacos/2.5.0/init/mysql-schema.sql +++ b/appstore/nacos/2.5.0/init/mysql-schema.sql @@ -20,43 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_info_beta */ @@ -64,18 +71,18 @@ CREATE TABLE `config_info_aggr` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -144,18 +151,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +229,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/appstore/nacos/README.md b/appstore/nacos/README.md index 961dde0b..3c144686 100644 --- a/appstore/nacos/README.md +++ b/appstore/nacos/README.md @@ -84,6 +84,40 @@ Nacos - JVM_MMS=8m #-XX:MaxMetaspaceSize default :320m ``` +## 升级说明 + +### 2.5.0 + +表结构发生变化 + +```sql +/******************************************/ +/* 表名称 = config_info since 2.5.0 */ +/******************************************/ +CREATE TABLE `config_info_gray` +( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + +``` + --- ![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 9a027a33..a2dd1ec2 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.0 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_0/.env b/dockge/nacos_2_5_0/.env new file mode 100644 index 00000000..25c02493 --- /dev/null +++ b/dockge/nacos_2_5_0/.env @@ -0,0 +1,66 @@ +# MySQL 服务 (前置检查) [必填] +PANEL_DB_TYPE=mysql + +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +NACOS_ROOT_PATH=/home/nacos + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8848 + +# Nacos gRPC 客户端端口 [必填] +PANEL_APP_PORT_GRPC_CLIENT=9848 + +# Nacos gRPC 服务端端口 [必填] +PANEL_APP_PORT_GRPC_SERVER=9849 + +# IP模式/域名模式 [必填] +PREFER_HOST_MODE=ip + +# 服务IP [必填] +NACOS_SERVER_IP= + +# Nacos身份验证密钥键 [必填] +NACOS_AUTH_IDENTITY_KEY=serverIdentity + +# Nacos身份验证密钥值 [必填] +NACOS_AUTH_IDENTITY_VALUE=security + +# Nacos身份验证令牌（至少32位字符的Base64编码） [必填] +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 + +# JVM_XMS (初始内存大小) [必填] +JVM_XMS=512m + +# JVM_XMX (最大内存大小) [必填] +JVM_XMX=2g + +# JVM_XMN (新生代内存) [必填] +JVM_XMN=128m + +# JVM_MS (初始元空间大小) [必填] +JVM_MS=128m + +# JVM_MMS (最大元空间大小) [必填] +JVM_MMS=320m + +# 数据库 主机 [必填] +MYSQL_SERVICE_HOST=127.0.0.1 + +# 数据库 端口 [必填] +MYSQL_SERVICE_PORT=3306 + +# 数据库 用户名 [必填] +MYSQL_SERVICE_USER=nacos + +# 数据库 密码 [必填] +MYSQL_SERVICE_PASSWORD= + +# 数据库 名称 [必填] +MYSQL_SERVICE_DB_NAME=nacos + +# 数据库 连接参数 [必填] +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + diff --git a/dockge/nacos_2_5_0/docker-compose.yml b/dockge/nacos_2_5_0/docker-compose.yml new file mode 100644 index 00000000..9a027a33 --- /dev/null +++ b/dockge/nacos_2_5_0/docker-compose.yml @@ -0,0 +1,26 @@ +networks: + 1panel-network: + external: true +services: + nacos: + container_name: nacos + env_file: + - ./envs/global.env + - .env + environment: + - MODE=standalone + - NACOS_SERVER_PORT=8848 + - NACOS_AUTH_ENABLE=true + - SPRING_DATASOURCE_PLATFORM=mysql + image: nacos/nacos-server:v2.5.0 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:8848 + - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 + - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + restart: always + volumes: + - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs + - ${NACOS_ROOT_PATH}/data:/home/nacos/data diff --git a/dockge/nacos_2_5_0/envs/default.env b/dockge/nacos_2_5_0/envs/default.env new file mode 100644 index 00000000..cd05f46e --- /dev/null +++ b/dockge/nacos_2_5_0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/nacos_2_5_0/envs/global.env b/dockge/nacos_2_5_0/envs/global.env new file mode 100644 index 00000000..e10989fe --- /dev/null +++ b/dockge/nacos_2_5_0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/nacos_2_5_0/init/mysql-schema.sql b/dockge/nacos_2_5_0/init/mysql-schema.sql new file mode 100644 index 00000000..e591aa98 --- /dev/null +++ b/dockge/nacos_2_5_0/init/mysql-schema.sql @@ -0,0 +1,231 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/******************************************/ +/* 表名称 = config_info */ +/******************************************/ +CREATE TABLE `config_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `c_schema` text COMMENT '配置的模式', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; + +/******************************************/ +/* 表名称 = config_info since 2.5.0 */ +/******************************************/ +CREATE TABLE `config_info_gray` +( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + +/******************************************/ +/* 表名称 = config_tags_relation */ +/******************************************/ +CREATE TABLE `config_tags_relation` +( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增长标识', + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; + +/******************************************/ +/* 表名称 = group_capacity */ +/******************************************/ +CREATE TABLE `group_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; + +/******************************************/ +/* 表名称 = his_config_info */ +/******************************************/ +CREATE TABLE `his_config_info` +( + `id` bigint(20) unsigned NOT NULL COMMENT 'id', + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + + +/******************************************/ +/* 表名称 = tenant_capacity */ +/******************************************/ +CREATE TABLE `tenant_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; + + +CREATE TABLE `tenant_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) default '' COMMENT 'tenant_id', + `tenant_name` varchar(128) default '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE `users` +( + `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', + `password` varchar(500) NOT NULL COMMENT 'password', + `enabled` boolean NOT NULL COMMENT 'enabled' +); + +CREATE TABLE `roles` +( + `username` varchar(50) NOT NULL COMMENT 'username', + `role` varchar(50) NOT NULL COMMENT 'role', + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE +); + +CREATE TABLE `permissions` +( + `role` varchar(50) NOT NULL COMMENT 'role', + `resource` varchar(128) NOT NULL COMMENT 'resource', + `action` varchar(8) NOT NULL COMMENT 'action', + UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +); From 25db8c8d9dc843b8383e7e3ed31279b80dd49231 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:06:27 +0000 Subject: [PATCH 06/29] Update wushuo894/ani-rss Docker tag to v1.1.223 --- apps/ani-rss/1.1.222/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ani-rss/1.1.222/docker-compose.yml b/apps/ani-rss/1.1.222/docker-compose.yml index ffea50b3..944e2fe3 100644 --- a/apps/ani-rss/1.1.222/docker-compose.yml +++ b/apps/ani-rss/1.1.222/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v1.1.222 + image: wushuo894/ani-rss:v1.1.223 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 1cc43a1248dcee62e58f4d1c01d3d1b79d32a326 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 22 Jan 2025 14:06:40 +0000 Subject: [PATCH 07/29] Update app version [skip ci] --- apps/ani-rss/{1.1.222 => 1.1.223}/data.yml | 0 apps/ani-rss/{1.1.222 => 1.1.223}/docker-compose.yml | 0 apps/ani-rss/{1.1.222 => 1.1.223}/envs/default.env | 0 apps/ani-rss/{1.1.222 => 1.1.223}/envs/global.env | 0 apps/ani-rss/{1.1.222 => 1.1.223}/scripts/init.sh | 0 apps/ani-rss/{1.1.222 => 1.1.223}/scripts/uninstall.sh | 0 apps/ani-rss/{1.1.222 => 1.1.223}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/ani-rss/{1.1.222 => 1.1.223}/data.yml (100%) rename apps/ani-rss/{1.1.222 => 1.1.223}/docker-compose.yml (100%) rename apps/ani-rss/{1.1.222 => 1.1.223}/envs/default.env (100%) rename apps/ani-rss/{1.1.222 => 1.1.223}/envs/global.env (100%) rename apps/ani-rss/{1.1.222 => 1.1.223}/scripts/init.sh (100%) rename apps/ani-rss/{1.1.222 => 1.1.223}/scripts/uninstall.sh (100%) rename apps/ani-rss/{1.1.222 => 1.1.223}/scripts/upgrade.sh (100%) diff --git a/apps/ani-rss/1.1.222/data.yml b/apps/ani-rss/1.1.223/data.yml similarity index 100% rename from apps/ani-rss/1.1.222/data.yml rename to apps/ani-rss/1.1.223/data.yml diff --git a/apps/ani-rss/1.1.222/docker-compose.yml b/apps/ani-rss/1.1.223/docker-compose.yml similarity index 100% rename from apps/ani-rss/1.1.222/docker-compose.yml rename to apps/ani-rss/1.1.223/docker-compose.yml diff --git a/apps/ani-rss/1.1.222/envs/default.env b/apps/ani-rss/1.1.223/envs/default.env similarity index 100% rename from apps/ani-rss/1.1.222/envs/default.env rename to apps/ani-rss/1.1.223/envs/default.env diff --git a/apps/ani-rss/1.1.222/envs/global.env b/apps/ani-rss/1.1.223/envs/global.env similarity index 100% rename from apps/ani-rss/1.1.222/envs/global.env rename to apps/ani-rss/1.1.223/envs/global.env diff --git a/apps/ani-rss/1.1.222/scripts/init.sh b/apps/ani-rss/1.1.223/scripts/init.sh similarity index 100% rename from apps/ani-rss/1.1.222/scripts/init.sh rename to apps/ani-rss/1.1.223/scripts/init.sh diff --git a/apps/ani-rss/1.1.222/scripts/uninstall.sh b/apps/ani-rss/1.1.223/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/1.1.222/scripts/uninstall.sh rename to apps/ani-rss/1.1.223/scripts/uninstall.sh diff --git a/apps/ani-rss/1.1.222/scripts/upgrade.sh b/apps/ani-rss/1.1.223/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/1.1.222/scripts/upgrade.sh rename to apps/ani-rss/1.1.223/scripts/upgrade.sh From 3a575c666c358ab42fed45e63283d819b4146f07 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:46:01 +0000 Subject: [PATCH 08/29] Update eigenfocus/eigenfocus Docker tag to v0.7.0 --- apps/eigenfocus/0.6.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/eigenfocus/0.6.0/docker-compose.yml b/apps/eigenfocus/0.6.0/docker-compose.yml index 2f09d59c..6fc557a3 100644 --- a/apps/eigenfocus/0.6.0/docker-compose.yml +++ b/apps/eigenfocus/0.6.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: eigenfocus: - image: eigenfocus/eigenfocus:0.6.0 + image: eigenfocus/eigenfocus:0.7.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From b730472c95bb78b4f398a197792fc142dc4593db Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 22 Jan 2025 17:46:14 +0000 Subject: [PATCH 09/29] Update app version [skip ci] --- apps/eigenfocus/{0.6.0 => 0.7.0}/data.yml | 0 apps/eigenfocus/{0.6.0 => 0.7.0}/docker-compose.yml | 0 apps/eigenfocus/{0.6.0 => 0.7.0}/envs/default.env | 0 apps/eigenfocus/{0.6.0 => 0.7.0}/envs/global.env | 0 apps/eigenfocus/{0.6.0 => 0.7.0}/scripts/init.sh | 0 apps/eigenfocus/{0.6.0 => 0.7.0}/scripts/uninstall.sh | 0 apps/eigenfocus/{0.6.0 => 0.7.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/eigenfocus/{0.6.0 => 0.7.0}/data.yml (100%) rename apps/eigenfocus/{0.6.0 => 0.7.0}/docker-compose.yml (100%) rename apps/eigenfocus/{0.6.0 => 0.7.0}/envs/default.env (100%) rename apps/eigenfocus/{0.6.0 => 0.7.0}/envs/global.env (100%) rename apps/eigenfocus/{0.6.0 => 0.7.0}/scripts/init.sh (100%) rename apps/eigenfocus/{0.6.0 => 0.7.0}/scripts/uninstall.sh (100%) rename apps/eigenfocus/{0.6.0 => 0.7.0}/scripts/upgrade.sh (100%) diff --git a/apps/eigenfocus/0.6.0/data.yml b/apps/eigenfocus/0.7.0/data.yml similarity index 100% rename from apps/eigenfocus/0.6.0/data.yml rename to apps/eigenfocus/0.7.0/data.yml diff --git a/apps/eigenfocus/0.6.0/docker-compose.yml b/apps/eigenfocus/0.7.0/docker-compose.yml similarity index 100% rename from apps/eigenfocus/0.6.0/docker-compose.yml rename to apps/eigenfocus/0.7.0/docker-compose.yml diff --git a/apps/eigenfocus/0.6.0/envs/default.env b/apps/eigenfocus/0.7.0/envs/default.env similarity index 100% rename from apps/eigenfocus/0.6.0/envs/default.env rename to apps/eigenfocus/0.7.0/envs/default.env diff --git a/apps/eigenfocus/0.6.0/envs/global.env b/apps/eigenfocus/0.7.0/envs/global.env similarity index 100% rename from apps/eigenfocus/0.6.0/envs/global.env rename to apps/eigenfocus/0.7.0/envs/global.env diff --git a/apps/eigenfocus/0.6.0/scripts/init.sh b/apps/eigenfocus/0.7.0/scripts/init.sh similarity index 100% rename from apps/eigenfocus/0.6.0/scripts/init.sh rename to apps/eigenfocus/0.7.0/scripts/init.sh diff --git a/apps/eigenfocus/0.6.0/scripts/uninstall.sh b/apps/eigenfocus/0.7.0/scripts/uninstall.sh similarity index 100% rename from apps/eigenfocus/0.6.0/scripts/uninstall.sh rename to apps/eigenfocus/0.7.0/scripts/uninstall.sh diff --git a/apps/eigenfocus/0.6.0/scripts/upgrade.sh b/apps/eigenfocus/0.7.0/scripts/upgrade.sh similarity index 100% rename from apps/eigenfocus/0.6.0/scripts/upgrade.sh rename to apps/eigenfocus/0.7.0/scripts/upgrade.sh From bdcfc47c043d1c16a9972e7798e8593d2e963409 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:42:06 +0000 Subject: [PATCH 10/29] Update amir20/dozzle Docker tag to v8.10.5 --- apps/dozzle/8.10.4/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dozzle/8.10.4/docker-compose.yml b/apps/dozzle/8.10.4/docker-compose.yml index abdad48b..2e35977d 100644 --- a/apps/dozzle/8.10.4/docker-compose.yml +++ b/apps/dozzle/8.10.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: dozzle: - image: amir20/dozzle:v8.10.4 + image: amir20/dozzle:v8.10.5 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 45dd6e7edb2bf8083abfdec9efc6e197a9452672 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 22 Jan 2025 21:42:17 +0000 Subject: [PATCH 11/29] Update app version [skip ci] --- apps/dozzle/{8.10.4 => 8.10.5}/data.yml | 0 apps/dozzle/{8.10.4 => 8.10.5}/docker-compose.yml | 0 apps/dozzle/{8.10.4 => 8.10.5}/envs/default.env | 0 apps/dozzle/{8.10.4 => 8.10.5}/envs/global.env | 0 apps/dozzle/{8.10.4 => 8.10.5}/scripts/init.sh | 0 apps/dozzle/{8.10.4 => 8.10.5}/scripts/uninstall.sh | 0 apps/dozzle/{8.10.4 => 8.10.5}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/dozzle/{8.10.4 => 8.10.5}/data.yml (100%) rename apps/dozzle/{8.10.4 => 8.10.5}/docker-compose.yml (100%) rename apps/dozzle/{8.10.4 => 8.10.5}/envs/default.env (100%) rename apps/dozzle/{8.10.4 => 8.10.5}/envs/global.env (100%) rename apps/dozzle/{8.10.4 => 8.10.5}/scripts/init.sh (100%) rename apps/dozzle/{8.10.4 => 8.10.5}/scripts/uninstall.sh (100%) rename apps/dozzle/{8.10.4 => 8.10.5}/scripts/upgrade.sh (100%) diff --git a/apps/dozzle/8.10.4/data.yml b/apps/dozzle/8.10.5/data.yml similarity index 100% rename from apps/dozzle/8.10.4/data.yml rename to apps/dozzle/8.10.5/data.yml diff --git a/apps/dozzle/8.10.4/docker-compose.yml b/apps/dozzle/8.10.5/docker-compose.yml similarity index 100% rename from apps/dozzle/8.10.4/docker-compose.yml rename to apps/dozzle/8.10.5/docker-compose.yml diff --git a/apps/dozzle/8.10.4/envs/default.env b/apps/dozzle/8.10.5/envs/default.env similarity index 100% rename from apps/dozzle/8.10.4/envs/default.env rename to apps/dozzle/8.10.5/envs/default.env diff --git a/apps/dozzle/8.10.4/envs/global.env b/apps/dozzle/8.10.5/envs/global.env similarity index 100% rename from apps/dozzle/8.10.4/envs/global.env rename to apps/dozzle/8.10.5/envs/global.env diff --git a/apps/dozzle/8.10.4/scripts/init.sh b/apps/dozzle/8.10.5/scripts/init.sh similarity index 100% rename from apps/dozzle/8.10.4/scripts/init.sh rename to apps/dozzle/8.10.5/scripts/init.sh diff --git a/apps/dozzle/8.10.4/scripts/uninstall.sh b/apps/dozzle/8.10.5/scripts/uninstall.sh similarity index 100% rename from apps/dozzle/8.10.4/scripts/uninstall.sh rename to apps/dozzle/8.10.5/scripts/uninstall.sh diff --git a/apps/dozzle/8.10.4/scripts/upgrade.sh b/apps/dozzle/8.10.5/scripts/upgrade.sh similarity index 100% rename from apps/dozzle/8.10.4/scripts/upgrade.sh rename to apps/dozzle/8.10.5/scripts/upgrade.sh From df5d0f8470bf2b11eff2707fc292fb899a1daf86 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 01:50:47 +0000 Subject: [PATCH 12/29] Update jxxghp/moviepilot-v2 Docker tag to v2.2.4 --- apps/movie-pilot/2.2.3/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/movie-pilot/2.2.3/docker-compose.yml b/apps/movie-pilot/2.2.3/docker-compose.yml index 9113132c..aba5ad7c 100644 --- a/apps/movie-pilot/2.2.3/docker-compose.yml +++ b/apps/movie-pilot/2.2.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: movie-pilot-v2: - image: jxxghp/moviepilot-v2:2.2.3 + image: jxxghp/moviepilot-v2:2.2.4 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From bbf6a3def0301aee7611dbb2cac8c5688f3fece7 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 23 Jan 2025 01:51:01 +0000 Subject: [PATCH 13/29] Update app version [skip ci] --- apps/movie-pilot/{2.2.3 => 2.2.4}/data.yml | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/docker-compose.yml | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/envs/default.env | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/envs/global.env | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/envs/movie-pilot.env | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/scripts/init.sh | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/scripts/uninstall.sh | 0 apps/movie-pilot/{2.2.3 => 2.2.4}/scripts/upgrade.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/movie-pilot/{2.2.3 => 2.2.4}/data.yml (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/docker-compose.yml (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/envs/default.env (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/envs/global.env (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/envs/movie-pilot.env (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/scripts/init.sh (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/scripts/uninstall.sh (100%) rename apps/movie-pilot/{2.2.3 => 2.2.4}/scripts/upgrade.sh (100%) diff --git a/apps/movie-pilot/2.2.3/data.yml b/apps/movie-pilot/2.2.4/data.yml similarity index 100% rename from apps/movie-pilot/2.2.3/data.yml rename to apps/movie-pilot/2.2.4/data.yml diff --git a/apps/movie-pilot/2.2.3/docker-compose.yml b/apps/movie-pilot/2.2.4/docker-compose.yml similarity index 100% rename from apps/movie-pilot/2.2.3/docker-compose.yml rename to apps/movie-pilot/2.2.4/docker-compose.yml diff --git a/apps/movie-pilot/2.2.3/envs/default.env b/apps/movie-pilot/2.2.4/envs/default.env similarity index 100% rename from apps/movie-pilot/2.2.3/envs/default.env rename to apps/movie-pilot/2.2.4/envs/default.env diff --git a/apps/movie-pilot/2.2.3/envs/global.env b/apps/movie-pilot/2.2.4/envs/global.env similarity index 100% rename from apps/movie-pilot/2.2.3/envs/global.env rename to apps/movie-pilot/2.2.4/envs/global.env diff --git a/apps/movie-pilot/2.2.3/envs/movie-pilot.env b/apps/movie-pilot/2.2.4/envs/movie-pilot.env similarity index 100% rename from apps/movie-pilot/2.2.3/envs/movie-pilot.env rename to apps/movie-pilot/2.2.4/envs/movie-pilot.env diff --git a/apps/movie-pilot/2.2.3/scripts/init.sh b/apps/movie-pilot/2.2.4/scripts/init.sh similarity index 100% rename from apps/movie-pilot/2.2.3/scripts/init.sh rename to apps/movie-pilot/2.2.4/scripts/init.sh diff --git a/apps/movie-pilot/2.2.3/scripts/uninstall.sh b/apps/movie-pilot/2.2.4/scripts/uninstall.sh similarity index 100% rename from apps/movie-pilot/2.2.3/scripts/uninstall.sh rename to apps/movie-pilot/2.2.4/scripts/uninstall.sh diff --git a/apps/movie-pilot/2.2.3/scripts/upgrade.sh b/apps/movie-pilot/2.2.4/scripts/upgrade.sh similarity index 100% rename from apps/movie-pilot/2.2.3/scripts/upgrade.sh rename to apps/movie-pilot/2.2.4/scripts/upgrade.sh From 3e88be6da20026d8388eb0fe46e2207aac46eb4c Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 23 Jan 2025 03:20:09 +0000 Subject: [PATCH 14/29] Processed apps directory via GitHub Actions --- appstore/ani-rss/{1.1.222 => 1.1.223}/.env | 0 .../ani-rss/{1.1.222 => 1.1.223}/data.yml | 0 .../{1.1.222 => 1.1.223}/docker-compose.yml | 2 +- .../{1.1.222 => 1.1.223}/envs/default.env | 0 .../{1.1.222 => 1.1.223}/envs/global.env | 0 .../{1.1.222 => 1.1.223}/scripts/init.sh | 0 .../{1.1.222 => 1.1.223}/scripts/uninstall.sh | 0 .../{1.1.222 => 1.1.223}/scripts/upgrade.sh | 0 appstore/casdoor/{1.811.0 => 1.812.0}/.env | 0 .../config/init_data.json | 0 .../casdoor/{1.811.0 => 1.812.0}/data.yml | 0 .../{1.811.0 => 1.812.0}/docker-compose.yml | 2 +- .../{1.811.0 => 1.812.0}/envs/casdoor.env | 0 .../{1.811.0 => 1.812.0}/envs/default.env | 0 .../{1.811.0 => 1.812.0}/envs/global.env | 0 .../{1.811.0 => 1.812.0}/scripts/init.sh | 0 .../{1.811.0 => 1.812.0}/scripts/uninstall.sh | 0 .../{1.811.0 => 1.812.0}/scripts/upgrade.sh | 0 appstore/dozzle/{8.10.4 => 8.10.5}/.env | 0 appstore/dozzle/{8.10.4 => 8.10.5}/data.yml | 0 .../{8.10.4 => 8.10.5}/docker-compose.yml | 2 +- .../{8.10.4 => 8.10.5}/envs/default.env | 0 .../dozzle/{8.10.4 => 8.10.5}/envs/global.env | 0 .../dozzle/{8.10.4 => 8.10.5}/scripts/init.sh | 0 .../{8.10.4 => 8.10.5}/scripts/uninstall.sh | 0 .../{8.10.4 => 8.10.5}/scripts/upgrade.sh | 0 appstore/eigenfocus/{0.6.0 => 0.7.0}/.env | 0 appstore/eigenfocus/{0.6.0 => 0.7.0}/data.yml | 0 .../{0.6.0 => 0.7.0}/docker-compose.yml | 2 +- .../{0.6.0 => 0.7.0}/envs/default.env | 0 .../{0.6.0 => 0.7.0}/envs/global.env | 0 .../{0.6.0 => 0.7.0}/scripts/init.sh | 0 .../{0.6.0 => 0.7.0}/scripts/uninstall.sh | 0 .../{0.6.0 => 0.7.0}/scripts/upgrade.sh | 0 appstore/movie-pilot/{2.2.3 => 2.2.4}/.env | 0 .../movie-pilot/{2.2.3 => 2.2.4}/data.yml | 0 .../{2.2.3 => 2.2.4}/docker-compose.yml | 2 +- .../{2.2.3 => 2.2.4}/envs/default.env | 0 .../{2.2.3 => 2.2.4}/envs/global.env | 0 .../{2.2.3 => 2.2.4}/envs/movie-pilot.env | 0 .../{2.2.3 => 2.2.4}/scripts/init.sh | 0 .../{2.2.3 => 2.2.4}/scripts/uninstall.sh | 0 .../{2.2.3 => 2.2.4}/scripts/upgrade.sh | 0 dockge/ani-rss/docker-compose.yml | 2 +- dockge/casdoor/docker-compose.yml | 2 +- dockge/dozzle/docker-compose.yml | 2 +- dockge/eigenfocus/docker-compose.yml | 2 +- dockge/movie-pilot/.env | 107 +++++++++++++- dockge/movie-pilot/docker-compose.yml | 6 +- dockge/movie-pilot/envs/movie-pilot.env | 24 +-- dockge/movie-pilot_1_9_17/.env | 138 ------------------ dockge/movie-pilot_2_2_4/.env | 33 +++++ .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 .../envs/movie-pilot.env | 24 ++- dockge/nacos/docker-compose.yml | 2 +- dockge/nacos/init/mysql-schema.sql | 114 ++++++++------- dockge/{nacos_2_5_0 => nacos_2_4_3}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 114 +++++++-------- 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 73 files changed, 300 insertions(+), 300 deletions(-) rename appstore/ani-rss/{1.1.222 => 1.1.223}/.env (100%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/data.yml (100%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/docker-compose.yml (95%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/envs/default.env (100%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/envs/global.env (100%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/scripts/init.sh (100%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{1.1.222 => 1.1.223}/scripts/upgrade.sh (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/.env (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/config/init_data.json (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/data.yml (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/docker-compose.yml (93%) rename appstore/casdoor/{1.811.0 => 1.812.0}/envs/casdoor.env (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/envs/default.env (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/envs/global.env (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/scripts/init.sh (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/scripts/uninstall.sh (100%) rename appstore/casdoor/{1.811.0 => 1.812.0}/scripts/upgrade.sh (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/.env (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/data.yml (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/docker-compose.yml (94%) rename appstore/dozzle/{8.10.4 => 8.10.5}/envs/default.env (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/envs/global.env (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/scripts/init.sh (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/scripts/uninstall.sh (100%) rename appstore/dozzle/{8.10.4 => 8.10.5}/scripts/upgrade.sh (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/.env (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/data.yml (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/docker-compose.yml (91%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/envs/default.env (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/envs/global.env (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/scripts/init.sh (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/scripts/uninstall.sh (100%) rename appstore/eigenfocus/{0.6.0 => 0.7.0}/scripts/upgrade.sh (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/.env (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/data.yml (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/docker-compose.yml (96%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/envs/default.env (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/envs/global.env (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/envs/movie-pilot.env (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/scripts/init.sh (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/scripts/uninstall.sh (100%) rename appstore/movie-pilot/{2.2.3 => 2.2.4}/scripts/upgrade.sh (100%) delete mode 100644 dockge/movie-pilot_1_9_17/.env create mode 100644 dockge/movie-pilot_2_2_4/.env rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/docker-compose.yml (89%) rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/envs/default.env (100%) rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/envs/global.env (100%) rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/envs/movie-pilot.env (75%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/.env (100%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/docker-compose.yml (94%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/envs/default.env (100%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/envs/global.env (100%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/init/mysql-schema.sql (68%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/.env (100%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/docker-compose.yml (85%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/envs/default.env (100%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/envs/global.env (100%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/.env (100%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/docker-compose.yml (95%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/envs/default.env (100%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/envs/global.env (100%) diff --git a/appstore/ani-rss/1.1.222/.env b/appstore/ani-rss/1.1.223/.env similarity index 100% rename from appstore/ani-rss/1.1.222/.env rename to appstore/ani-rss/1.1.223/.env diff --git a/appstore/ani-rss/1.1.222/data.yml b/appstore/ani-rss/1.1.223/data.yml similarity index 100% rename from appstore/ani-rss/1.1.222/data.yml rename to appstore/ani-rss/1.1.223/data.yml diff --git a/appstore/ani-rss/1.1.222/docker-compose.yml b/appstore/ani-rss/1.1.223/docker-compose.yml similarity index 95% rename from appstore/ani-rss/1.1.222/docker-compose.yml rename to appstore/ani-rss/1.1.223/docker-compose.yml index b2b8d2ba..e4d42ffb 100644 --- a/appstore/ani-rss/1.1.222/docker-compose.yml +++ b/appstore/ani-rss/1.1.223/docker-compose.yml @@ -11,7 +11,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.1.222 + image: wushuo894/ani-rss:v1.1.223 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/1.1.222/envs/default.env b/appstore/ani-rss/1.1.223/envs/default.env similarity index 100% rename from appstore/ani-rss/1.1.222/envs/default.env rename to appstore/ani-rss/1.1.223/envs/default.env diff --git a/appstore/ani-rss/1.1.222/envs/global.env b/appstore/ani-rss/1.1.223/envs/global.env similarity index 100% rename from appstore/ani-rss/1.1.222/envs/global.env rename to appstore/ani-rss/1.1.223/envs/global.env diff --git a/appstore/ani-rss/1.1.222/scripts/init.sh b/appstore/ani-rss/1.1.223/scripts/init.sh similarity index 100% rename from appstore/ani-rss/1.1.222/scripts/init.sh rename to appstore/ani-rss/1.1.223/scripts/init.sh diff --git a/appstore/ani-rss/1.1.222/scripts/uninstall.sh b/appstore/ani-rss/1.1.223/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/1.1.222/scripts/uninstall.sh rename to appstore/ani-rss/1.1.223/scripts/uninstall.sh diff --git a/appstore/ani-rss/1.1.222/scripts/upgrade.sh b/appstore/ani-rss/1.1.223/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/1.1.222/scripts/upgrade.sh rename to appstore/ani-rss/1.1.223/scripts/upgrade.sh diff --git a/appstore/casdoor/1.811.0/.env b/appstore/casdoor/1.812.0/.env similarity index 100% rename from appstore/casdoor/1.811.0/.env rename to appstore/casdoor/1.812.0/.env diff --git a/appstore/casdoor/1.811.0/config/init_data.json b/appstore/casdoor/1.812.0/config/init_data.json similarity index 100% rename from appstore/casdoor/1.811.0/config/init_data.json rename to appstore/casdoor/1.812.0/config/init_data.json diff --git a/appstore/casdoor/1.811.0/data.yml b/appstore/casdoor/1.812.0/data.yml similarity index 100% rename from appstore/casdoor/1.811.0/data.yml rename to appstore/casdoor/1.812.0/data.yml diff --git a/appstore/casdoor/1.811.0/docker-compose.yml b/appstore/casdoor/1.812.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/1.811.0/docker-compose.yml rename to appstore/casdoor/1.812.0/docker-compose.yml index ee9274bf..05018f6d 100644 --- a/appstore/casdoor/1.811.0/docker-compose.yml +++ b/appstore/casdoor/1.812.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.811.0 + image: casbin/casdoor:v1.812.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/1.811.0/envs/casdoor.env b/appstore/casdoor/1.812.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/1.811.0/envs/casdoor.env rename to appstore/casdoor/1.812.0/envs/casdoor.env diff --git a/appstore/casdoor/1.811.0/envs/default.env b/appstore/casdoor/1.812.0/envs/default.env similarity index 100% rename from appstore/casdoor/1.811.0/envs/default.env rename to appstore/casdoor/1.812.0/envs/default.env diff --git a/appstore/casdoor/1.811.0/envs/global.env b/appstore/casdoor/1.812.0/envs/global.env similarity index 100% rename from appstore/casdoor/1.811.0/envs/global.env rename to appstore/casdoor/1.812.0/envs/global.env diff --git a/appstore/casdoor/1.811.0/scripts/init.sh b/appstore/casdoor/1.812.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/1.811.0/scripts/init.sh rename to appstore/casdoor/1.812.0/scripts/init.sh diff --git a/appstore/casdoor/1.811.0/scripts/uninstall.sh b/appstore/casdoor/1.812.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/1.811.0/scripts/uninstall.sh rename to appstore/casdoor/1.812.0/scripts/uninstall.sh diff --git a/appstore/casdoor/1.811.0/scripts/upgrade.sh b/appstore/casdoor/1.812.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/1.811.0/scripts/upgrade.sh rename to appstore/casdoor/1.812.0/scripts/upgrade.sh diff --git a/appstore/dozzle/8.10.4/.env b/appstore/dozzle/8.10.5/.env similarity index 100% rename from appstore/dozzle/8.10.4/.env rename to appstore/dozzle/8.10.5/.env diff --git a/appstore/dozzle/8.10.4/data.yml b/appstore/dozzle/8.10.5/data.yml similarity index 100% rename from appstore/dozzle/8.10.4/data.yml rename to appstore/dozzle/8.10.5/data.yml diff --git a/appstore/dozzle/8.10.4/docker-compose.yml b/appstore/dozzle/8.10.5/docker-compose.yml similarity index 94% rename from appstore/dozzle/8.10.4/docker-compose.yml rename to appstore/dozzle/8.10.5/docker-compose.yml index 0018704f..4acd7103 100644 --- a/appstore/dozzle/8.10.4/docker-compose.yml +++ b/appstore/dozzle/8.10.5/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.10.4 + image: amir20/dozzle:v8.10.5 labels: createdBy: Apps networks: diff --git a/appstore/dozzle/8.10.4/envs/default.env b/appstore/dozzle/8.10.5/envs/default.env similarity index 100% rename from appstore/dozzle/8.10.4/envs/default.env rename to appstore/dozzle/8.10.5/envs/default.env diff --git a/appstore/dozzle/8.10.4/envs/global.env b/appstore/dozzle/8.10.5/envs/global.env similarity index 100% rename from appstore/dozzle/8.10.4/envs/global.env rename to appstore/dozzle/8.10.5/envs/global.env diff --git a/appstore/dozzle/8.10.4/scripts/init.sh b/appstore/dozzle/8.10.5/scripts/init.sh similarity index 100% rename from appstore/dozzle/8.10.4/scripts/init.sh rename to appstore/dozzle/8.10.5/scripts/init.sh diff --git a/appstore/dozzle/8.10.4/scripts/uninstall.sh b/appstore/dozzle/8.10.5/scripts/uninstall.sh similarity index 100% rename from appstore/dozzle/8.10.4/scripts/uninstall.sh rename to appstore/dozzle/8.10.5/scripts/uninstall.sh diff --git a/appstore/dozzle/8.10.4/scripts/upgrade.sh b/appstore/dozzle/8.10.5/scripts/upgrade.sh similarity index 100% rename from appstore/dozzle/8.10.4/scripts/upgrade.sh rename to appstore/dozzle/8.10.5/scripts/upgrade.sh diff --git a/appstore/eigenfocus/0.6.0/.env b/appstore/eigenfocus/0.7.0/.env similarity index 100% rename from appstore/eigenfocus/0.6.0/.env rename to appstore/eigenfocus/0.7.0/.env diff --git a/appstore/eigenfocus/0.6.0/data.yml b/appstore/eigenfocus/0.7.0/data.yml similarity index 100% rename from appstore/eigenfocus/0.6.0/data.yml rename to appstore/eigenfocus/0.7.0/data.yml diff --git a/appstore/eigenfocus/0.6.0/docker-compose.yml b/appstore/eigenfocus/0.7.0/docker-compose.yml similarity index 91% rename from appstore/eigenfocus/0.6.0/docker-compose.yml rename to appstore/eigenfocus/0.7.0/docker-compose.yml index c346a23d..b981f5da 100644 --- a/appstore/eigenfocus/0.6.0/docker-compose.yml +++ b/appstore/eigenfocus/0.7.0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: eigenfocus/eigenfocus:0.6.0 + image: eigenfocus/eigenfocus:0.7.0 labels: createdBy: Apps networks: diff --git a/appstore/eigenfocus/0.6.0/envs/default.env b/appstore/eigenfocus/0.7.0/envs/default.env similarity index 100% rename from appstore/eigenfocus/0.6.0/envs/default.env rename to appstore/eigenfocus/0.7.0/envs/default.env diff --git a/appstore/eigenfocus/0.6.0/envs/global.env b/appstore/eigenfocus/0.7.0/envs/global.env similarity index 100% rename from appstore/eigenfocus/0.6.0/envs/global.env rename to appstore/eigenfocus/0.7.0/envs/global.env diff --git a/appstore/eigenfocus/0.6.0/scripts/init.sh b/appstore/eigenfocus/0.7.0/scripts/init.sh similarity index 100% rename from appstore/eigenfocus/0.6.0/scripts/init.sh rename to appstore/eigenfocus/0.7.0/scripts/init.sh diff --git a/appstore/eigenfocus/0.6.0/scripts/uninstall.sh b/appstore/eigenfocus/0.7.0/scripts/uninstall.sh similarity index 100% rename from appstore/eigenfocus/0.6.0/scripts/uninstall.sh rename to appstore/eigenfocus/0.7.0/scripts/uninstall.sh diff --git a/appstore/eigenfocus/0.6.0/scripts/upgrade.sh b/appstore/eigenfocus/0.7.0/scripts/upgrade.sh similarity index 100% rename from appstore/eigenfocus/0.6.0/scripts/upgrade.sh rename to appstore/eigenfocus/0.7.0/scripts/upgrade.sh diff --git a/appstore/movie-pilot/2.2.3/.env b/appstore/movie-pilot/2.2.4/.env similarity index 100% rename from appstore/movie-pilot/2.2.3/.env rename to appstore/movie-pilot/2.2.4/.env diff --git a/appstore/movie-pilot/2.2.3/data.yml b/appstore/movie-pilot/2.2.4/data.yml similarity index 100% rename from appstore/movie-pilot/2.2.3/data.yml rename to appstore/movie-pilot/2.2.4/data.yml diff --git a/appstore/movie-pilot/2.2.3/docker-compose.yml b/appstore/movie-pilot/2.2.4/docker-compose.yml similarity index 96% rename from appstore/movie-pilot/2.2.3/docker-compose.yml rename to appstore/movie-pilot/2.2.4/docker-compose.yml index fe60379e..f02442a0 100644 --- a/appstore/movie-pilot/2.2.3/docker-compose.yml +++ b/appstore/movie-pilot/2.2.4/docker-compose.yml @@ -16,7 +16,7 @@ services: - UMASK=022 - HTTP_PROXY=${PROXY_HOST} - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.2.3 + image: jxxghp/moviepilot-v2:2.2.4 labels: createdBy: Apps logging: diff --git a/appstore/movie-pilot/2.2.3/envs/default.env b/appstore/movie-pilot/2.2.4/envs/default.env similarity index 100% rename from appstore/movie-pilot/2.2.3/envs/default.env rename to appstore/movie-pilot/2.2.4/envs/default.env diff --git a/appstore/movie-pilot/2.2.3/envs/global.env b/appstore/movie-pilot/2.2.4/envs/global.env similarity index 100% rename from appstore/movie-pilot/2.2.3/envs/global.env rename to appstore/movie-pilot/2.2.4/envs/global.env diff --git a/appstore/movie-pilot/2.2.3/envs/movie-pilot.env b/appstore/movie-pilot/2.2.4/envs/movie-pilot.env similarity index 100% rename from appstore/movie-pilot/2.2.3/envs/movie-pilot.env rename to appstore/movie-pilot/2.2.4/envs/movie-pilot.env diff --git a/appstore/movie-pilot/2.2.3/scripts/init.sh b/appstore/movie-pilot/2.2.4/scripts/init.sh similarity index 100% rename from appstore/movie-pilot/2.2.3/scripts/init.sh rename to appstore/movie-pilot/2.2.4/scripts/init.sh diff --git a/appstore/movie-pilot/2.2.3/scripts/uninstall.sh b/appstore/movie-pilot/2.2.4/scripts/uninstall.sh similarity index 100% rename from appstore/movie-pilot/2.2.3/scripts/uninstall.sh rename to appstore/movie-pilot/2.2.4/scripts/uninstall.sh diff --git a/appstore/movie-pilot/2.2.3/scripts/upgrade.sh b/appstore/movie-pilot/2.2.4/scripts/upgrade.sh similarity index 100% rename from appstore/movie-pilot/2.2.3/scripts/upgrade.sh rename to appstore/movie-pilot/2.2.4/scripts/upgrade.sh diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index b2b8d2ba..e4d42ffb 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -11,7 +11,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.1.222 + image: wushuo894/ani-rss:v1.1.223 labels: createdBy: Apps networks: diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index ee9274bf..05018f6d 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.811.0 + image: casbin/casdoor:v1.812.0 labels: createdBy: Apps networks: diff --git a/dockge/dozzle/docker-compose.yml b/dockge/dozzle/docker-compose.yml index 0018704f..4acd7103 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.10.4 + image: amir20/dozzle:v8.10.5 labels: createdBy: Apps networks: diff --git a/dockge/eigenfocus/docker-compose.yml b/dockge/eigenfocus/docker-compose.yml index c346a23d..b981f5da 100644 --- a/dockge/eigenfocus/docker-compose.yml +++ b/dockge/eigenfocus/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: eigenfocus/eigenfocus:0.6.0 + image: eigenfocus/eigenfocus:0.7.0 labels: createdBy: Apps networks: diff --git a/dockge/movie-pilot/.env b/dockge/movie-pilot/.env index f2b00857..a66ae0c6 100644 --- a/dockge/movie-pilot/.env +++ b/dockge/movie-pilot/.env @@ -17,7 +17,10 @@ API_TOKEN=moviepilot PROXY_HOST= # 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCE=false +AUTO_UPDATE_RESOURCES=false + +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= @@ -31,3 +34,105 @@ CUSTOM_MOUNT_DIRECTORY_3= # IYUU登录令牌 IYUU_SIGN= +# hhclub 用户名 +HHCLUB_USERNAME= + +# hhclub 密钥 +HHCLUB_PASSKEY= + +# audiences 用户ID +AUDIENCES_UID= + +# audiences 密钥 +AUDIENCES_PASSKEY= + +# hddolby 用户ID +HDDOLBY_ID= + +# hddolby 密钥 +HDDOLBY_PASSKEY= + +# zmpt 用户ID +ZMPT_UID= + +# zmpt 密钥 +ZMPT_PASSKEY= + +# freefarm 用户ID +FREEFARM_UID= + +# freefarm 密钥 +FREEFARM_PASSKEY= + +# hdfans 用户ID +HDFANS_UID= + +# hdfans 密钥 +HDFANS_PASSKEY= + +# wintersakura 用户ID +WINTERSAKURA_UID= + +# wintersakura 密钥 +WINTERSAKURA_PASSKEY= + +# leaves 用户ID +LEAVES_UID= + +# leaves 密钥 +LEAVES_PASSKEY= + +# ptba 用户ID +PTBA_UID= + +# ptba 密钥 +PTBA_PASSKEY= + +# icc2022 用户ID +ICC2022_UID= + +# icc2022 密钥 +ICC2022_PASSKEY= + +# xingtan 用户ID +XINGTAN_UID= + +# xingtan 密钥 +XINGTAN_PASSKEY= + +# ptvicomo 用户ID +PTVICOMO_UID= + +# ptvicomo 密钥 +PTVICOMO_PASSKEY= + +# agsvpt 用户ID +AGSVPT_UID= + +# agsvpt 密钥 +AGSVPT_PASSKEY= + +# hdkyl 用户ID +HDKYL_UID= + +# hdkyl 密钥 +HDKYL_PASSKEY= + +# qingwa 用户ID +QINGWA_UID= + +# qingwa 密钥 +QINGWA_PASSKEY= + +# discfan 用户ID +DISCFAN_UID= + +# discfan 密钥 +DISCFAN_PASSKEY= + +# rousi 用户ID +ROUSI_UID= + +# rousi 密钥 +ROUSI_PASSKEY= + diff --git a/dockge/movie-pilot/docker-compose.yml b/dockge/movie-pilot/docker-compose.yml index fe60379e..1e72340a 100644 --- a/dockge/movie-pilot/docker-compose.yml +++ b/dockge/movie-pilot/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - movie-pilot-v2: + movie-pilot: container_name: movie-pilot env_file: - ./envs/global.env @@ -14,9 +14,7 @@ services: - PUID=0 - PGID=0 - UMASK=022 - - HTTP_PROXY=${PROXY_HOST} - - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.2.3 + image: jxxghp/moviepilot:1.9.17 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot/envs/movie-pilot.env b/dockge/movie-pilot/envs/movie-pilot.env index 78ba50bf..d244ac86 100644 --- a/dockge/movie-pilot/envs/movie-pilot.env +++ b/dockge/movie-pilot/envs/movie-pilot.env @@ -7,33 +7,19 @@ HOST=0.0.0.0 DEBUG=false # 是否开发模式，打开后后台服务将不会启动 DEV=false -# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG -LOG_LEVEL=INFO -# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 -DB_POOL_SIZE=100 -# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 -DB_MAX_OVERFLOW=500 -# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 -DB_TIMEOUT=60 # 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） SUPERUSER=admin -# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 -AUXILIARY_AUTH_ENABLE=false # 大内存模式，开启后会增加缓存数量，但会占用更多内存 BIG_MEMORY_MODE=false # 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 DOH_ENABLE=true -# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 -DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org -# DOH 解析服务器列表，多个服务器使用`,`分隔 -DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 # 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 META_CACHE_EXPIRE=0 # 自动检查和更新站点资源包（索引、认证等） AUTO_UPDATE_RESOURCE=true -# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 -API_TOKEN='' -# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org +# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 +API_TOKEN=moviepilot +# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org WALLPAPER=tmdb # TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` TMDB_IMAGE_DOMAIN=image.tmdb.org @@ -61,3 +47,7 @@ OCR_HOST=https://movie-pilot.org PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins # 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 SEARCH_MULTIPLE_NAME=true + + +# 自定义配置 +AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/dockge/movie-pilot_1_9_17/.env b/dockge/movie-pilot_1_9_17/.env deleted file mode 100644 index a66ae0c6..00000000 --- a/dockge/movie-pilot_1_9_17/.env +++ /dev/null @@ -1,138 +0,0 @@ -# 数据持久化路径 [必填] -MOVIEPILOT_ROOT_PATH=/home/movie-pilot - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3000 - -# API 端口 [必填] -PANEL_APP_PORT_API=3001 - -# 管理员用户名 [必填] -SUPERUSER=admin - -# API 令牌 [必填] -API_TOKEN=moviepilot - -# 网络代理 -PROXY_HOST= - -# 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCES=false - -# 自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false - -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - -# IYUU登录令牌 -IYUU_SIGN= - -# hhclub 用户名 -HHCLUB_USERNAME= - -# hhclub 密钥 -HHCLUB_PASSKEY= - -# audiences 用户ID -AUDIENCES_UID= - -# audiences 密钥 -AUDIENCES_PASSKEY= - -# hddolby 用户ID -HDDOLBY_ID= - -# hddolby 密钥 -HDDOLBY_PASSKEY= - -# zmpt 用户ID -ZMPT_UID= - -# zmpt 密钥 -ZMPT_PASSKEY= - -# freefarm 用户ID -FREEFARM_UID= - -# freefarm 密钥 -FREEFARM_PASSKEY= - -# hdfans 用户ID -HDFANS_UID= - -# hdfans 密钥 -HDFANS_PASSKEY= - -# wintersakura 用户ID -WINTERSAKURA_UID= - -# wintersakura 密钥 -WINTERSAKURA_PASSKEY= - -# leaves 用户ID -LEAVES_UID= - -# leaves 密钥 -LEAVES_PASSKEY= - -# ptba 用户ID -PTBA_UID= - -# ptba 密钥 -PTBA_PASSKEY= - -# icc2022 用户ID -ICC2022_UID= - -# icc2022 密钥 -ICC2022_PASSKEY= - -# xingtan 用户ID -XINGTAN_UID= - -# xingtan 密钥 -XINGTAN_PASSKEY= - -# ptvicomo 用户ID -PTVICOMO_UID= - -# ptvicomo 密钥 -PTVICOMO_PASSKEY= - -# agsvpt 用户ID -AGSVPT_UID= - -# agsvpt 密钥 -AGSVPT_PASSKEY= - -# hdkyl 用户ID -HDKYL_UID= - -# hdkyl 密钥 -HDKYL_PASSKEY= - -# qingwa 用户ID -QINGWA_UID= - -# qingwa 密钥 -QINGWA_PASSKEY= - -# discfan 用户ID -DISCFAN_UID= - -# discfan 密钥 -DISCFAN_PASSKEY= - -# rousi 用户ID -ROUSI_UID= - -# rousi 密钥 -ROUSI_PASSKEY= - diff --git a/dockge/movie-pilot_2_2_4/.env b/dockge/movie-pilot_2_2_4/.env new file mode 100644 index 00000000..f2b00857 --- /dev/null +++ b/dockge/movie-pilot_2_2_4/.env @@ -0,0 +1,33 @@ +# 数据持久化路径 [必填] +MOVIEPILOT_ROOT_PATH=/home/movie-pilot + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + +# API 端口 [必填] +PANEL_APP_PORT_API=3001 + +# 管理员用户名 [必填] +SUPERUSER=admin + +# API 令牌 [必填] +API_TOKEN=moviepilot + +# 网络代理 +PROXY_HOST= + +# 自动更新资源包 [必填] +AUTO_UPDATE_RESOURCE=false + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + +# IYUU登录令牌 +IYUU_SIGN= + diff --git a/dockge/movie-pilot_1_9_17/docker-compose.yml b/dockge/movie-pilot_2_2_4/docker-compose.yml similarity index 89% rename from dockge/movie-pilot_1_9_17/docker-compose.yml rename to dockge/movie-pilot_2_2_4/docker-compose.yml index 1e72340a..f02442a0 100644 --- a/dockge/movie-pilot_1_9_17/docker-compose.yml +++ b/dockge/movie-pilot_2_2_4/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - movie-pilot: + movie-pilot-v2: container_name: movie-pilot env_file: - ./envs/global.env @@ -14,7 +14,9 @@ services: - PUID=0 - PGID=0 - UMASK=022 - image: jxxghp/moviepilot:1.9.17 + - HTTP_PROXY=${PROXY_HOST} + - HTTPS_PROXY=${PROXY_HOST} + image: jxxghp/moviepilot-v2:2.2.4 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot_1_9_17/envs/default.env b/dockge/movie-pilot_2_2_4/envs/default.env similarity index 100% rename from dockge/movie-pilot_1_9_17/envs/default.env rename to dockge/movie-pilot_2_2_4/envs/default.env diff --git a/dockge/movie-pilot_1_9_17/envs/global.env b/dockge/movie-pilot_2_2_4/envs/global.env similarity index 100% rename from dockge/movie-pilot_1_9_17/envs/global.env rename to dockge/movie-pilot_2_2_4/envs/global.env diff --git a/dockge/movie-pilot_1_9_17/envs/movie-pilot.env b/dockge/movie-pilot_2_2_4/envs/movie-pilot.env similarity index 75% rename from dockge/movie-pilot_1_9_17/envs/movie-pilot.env rename to dockge/movie-pilot_2_2_4/envs/movie-pilot.env index d244ac86..78ba50bf 100644 --- a/dockge/movie-pilot_1_9_17/envs/movie-pilot.env +++ b/dockge/movie-pilot_2_2_4/envs/movie-pilot.env @@ -7,19 +7,33 @@ HOST=0.0.0.0 DEBUG=false # 是否开发模式，打开后后台服务将不会启动 DEV=false +# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG +LOG_LEVEL=INFO +# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 +DB_POOL_SIZE=100 +# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 +DB_MAX_OVERFLOW=500 +# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 +DB_TIMEOUT=60 # 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） SUPERUSER=admin +# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 +AUXILIARY_AUTH_ENABLE=false # 大内存模式，开启后会增加缓存数量，但会占用更多内存 BIG_MEMORY_MODE=false # 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 DOH_ENABLE=true +# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 +DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org +# DOH 解析服务器列表，多个服务器使用`,`分隔 +DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 # 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 META_CACHE_EXPIRE=0 # 自动检查和更新站点资源包（索引、认证等） AUTO_UPDATE_RESOURCE=true -# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 -API_TOKEN=moviepilot -# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org +# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 +API_TOKEN='' +# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org WALLPAPER=tmdb # TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` TMDB_IMAGE_DOMAIN=image.tmdb.org @@ -47,7 +61,3 @@ OCR_HOST=https://movie-pilot.org PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins # 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 SEARCH_MULTIPLE_NAME=true - - -# 自定义配置 -AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index a2dd1ec2..9a027a33 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos/init/mysql-schema.sql b/dockge/nacos/init/mysql-schema.sql index 067d67a1..e591aa98 100644 --- a/dockge/nacos/init/mysql-schema.sql +++ b/dockge/nacos/init/mysql-schema.sql @@ -20,43 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_info_beta */ @@ -64,18 +71,18 @@ CREATE TABLE `config_info_aggr` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -144,18 +151,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +229,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/nacos_2_5_0/.env b/dockge/nacos_2_4_3/.env similarity index 100% rename from dockge/nacos_2_5_0/.env rename to dockge/nacos_2_4_3/.env diff --git a/dockge/nacos_2_5_0/docker-compose.yml b/dockge/nacos_2_4_3/docker-compose.yml similarity index 94% rename from dockge/nacos_2_5_0/docker-compose.yml rename to dockge/nacos_2_4_3/docker-compose.yml index 9a027a33..a2dd1ec2 100644 --- a/dockge/nacos_2_5_0/docker-compose.yml +++ b/dockge/nacos_2_4_3/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.0 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_0/envs/default.env b/dockge/nacos_2_4_3/envs/default.env similarity index 100% rename from dockge/nacos_2_5_0/envs/default.env rename to dockge/nacos_2_4_3/envs/default.env diff --git a/dockge/nacos_2_5_0/envs/global.env b/dockge/nacos_2_4_3/envs/global.env similarity index 100% rename from dockge/nacos_2_5_0/envs/global.env rename to dockge/nacos_2_4_3/envs/global.env diff --git a/dockge/nacos_2_5_0/init/mysql-schema.sql b/dockge/nacos_2_4_3/init/mysql-schema.sql similarity index 68% rename from dockge/nacos_2_5_0/init/mysql-schema.sql rename to dockge/nacos_2_4_3/init/mysql-schema.sql index e591aa98..067d67a1 100644 --- a/dockge/nacos_2_5_0/init/mysql-schema.sql +++ b/dockge/nacos_2_4_3/init/mysql-schema.sql @@ -20,50 +20,43 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info since 2.5.0 */ +/* 表名称 = config_info_aggr */ /******************************************/ -CREATE TABLE `config_info_gray` +CREATE TABLE `config_info_aggr` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `src_user` text COMMENT 'src_user', - `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', - `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', - `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', - `gray_rule` text NOT NULL COMMENT 'gray_rule', - `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), - KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), - KEY `idx_gmt_modified` (`gmt_modified`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + /******************************************/ /* 表名称 = config_info_beta */ @@ -71,18 +64,18 @@ CREATE TABLE `config_info_gray` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -151,21 +144,18 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', - `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', - `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -229,3 +219,9 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 53121747..a02df308 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-postgresql + container_name: pg14-vectors-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:16 + image: tensorchord/pgvecto-rs:pg14-v0.2.1 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14-vectors/.env b/dockge/postgresql_pg16/.env similarity index 100% rename from dockge/postgresql_pg14-vectors/.env rename to dockge/postgresql_pg16/.env diff --git a/dockge/postgresql_pg14-vectors/docker-compose.yml b/dockge/postgresql_pg16/docker-compose.yml similarity index 85% rename from dockge/postgresql_pg14-vectors/docker-compose.yml rename to dockge/postgresql_pg16/docker-compose.yml index a02df308..53121747 100644 --- a/dockge/postgresql_pg14-vectors/docker-compose.yml +++ b/dockge/postgresql_pg16/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-vectors-postgresql + container_name: pg16-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: tensorchord/pgvecto-rs:pg14-v0.2.1 + image: postgres:16 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14-vectors/envs/default.env b/dockge/postgresql_pg16/envs/default.env similarity index 100% rename from dockge/postgresql_pg14-vectors/envs/default.env rename to dockge/postgresql_pg16/envs/default.env diff --git a/dockge/postgresql_pg14-vectors/envs/global.env b/dockge/postgresql_pg16/envs/global.env similarity index 100% rename from dockge/postgresql_pg14-vectors/envs/global.env rename to dockge/postgresql_pg16/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458..18db6192 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.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_0_3/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_0_3/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_0_3/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_0_3/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index 18db6192..5ec4b458 100644 --- a/dockge/qbittorrent_5_0_3/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.0.3 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_0_3/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_0_3/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/qbittorrent_5_0_3/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_0_3/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env From 4247ba04e81c09ae3e8976ec9d5921d42342bdda Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 23 Jan 2025 06:26:14 +0000 Subject: [PATCH 15/29] Processed apps directory via GitHub Actions --- dockge/movie-pilot/.env | 107 +------------- dockge/movie-pilot/docker-compose.yml | 6 +- dockge/movie-pilot/envs/movie-pilot.env | 24 ++- dockge/movie-pilot_1_9_17/.env | 138 ++++++++++++++++++ .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 .../envs/movie-pilot.env | 24 +-- dockge/movie-pilot_2_2_4/.env | 33 ----- dockge/nacos/docker-compose.yml | 2 +- dockge/nacos/init/mysql-schema.sql | 114 +++++++-------- dockge/{nacos_2_4_3 => nacos_2_5_0}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 114 ++++++++------- 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 26 files changed, 291 insertions(+), 291 deletions(-) create mode 100644 dockge/movie-pilot_1_9_17/.env rename dockge/{movie-pilot_2_2_4 => movie-pilot_1_9_17}/docker-compose.yml (89%) rename dockge/{movie-pilot_2_2_4 => movie-pilot_1_9_17}/envs/default.env (100%) rename dockge/{movie-pilot_2_2_4 => movie-pilot_1_9_17}/envs/global.env (100%) rename dockge/{movie-pilot_2_2_4 => movie-pilot_1_9_17}/envs/movie-pilot.env (75%) delete mode 100644 dockge/movie-pilot_2_2_4/.env rename dockge/{nacos_2_4_3 => nacos_2_5_0}/.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_0}/docker-compose.yml (94%) rename dockge/{nacos_2_4_3 => nacos_2_5_0}/envs/default.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_0}/envs/global.env (100%) rename dockge/{nacos_2_4_3 => nacos_2_5_0}/init/mysql-schema.sql (68%) rename dockge/{postgresql_pg16 => postgresql_pg14-vectors}/.env (100%) rename dockge/{postgresql_pg16 => postgresql_pg14-vectors}/docker-compose.yml (85%) rename dockge/{postgresql_pg16 => postgresql_pg14-vectors}/envs/default.env (100%) rename dockge/{postgresql_pg16 => postgresql_pg14-vectors}/envs/global.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_0_3}/.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_0_3}/docker-compose.yml (95%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_0_3}/envs/default.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_0_3}/envs/global.env (100%) diff --git a/dockge/movie-pilot/.env b/dockge/movie-pilot/.env index a66ae0c6..f2b00857 100644 --- a/dockge/movie-pilot/.env +++ b/dockge/movie-pilot/.env @@ -17,10 +17,7 @@ API_TOKEN=moviepilot PROXY_HOST= # 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCES=false - -# 自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false +AUTO_UPDATE_RESOURCE=false # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= @@ -34,105 +31,3 @@ CUSTOM_MOUNT_DIRECTORY_3= # IYUU登录令牌 IYUU_SIGN= -# hhclub 用户名 -HHCLUB_USERNAME= - -# hhclub 密钥 -HHCLUB_PASSKEY= - -# audiences 用户ID -AUDIENCES_UID= - -# audiences 密钥 -AUDIENCES_PASSKEY= - -# hddolby 用户ID -HDDOLBY_ID= - -# hddolby 密钥 -HDDOLBY_PASSKEY= - -# zmpt 用户ID -ZMPT_UID= - -# zmpt 密钥 -ZMPT_PASSKEY= - -# freefarm 用户ID -FREEFARM_UID= - -# freefarm 密钥 -FREEFARM_PASSKEY= - -# hdfans 用户ID -HDFANS_UID= - -# hdfans 密钥 -HDFANS_PASSKEY= - -# wintersakura 用户ID -WINTERSAKURA_UID= - -# wintersakura 密钥 -WINTERSAKURA_PASSKEY= - -# leaves 用户ID -LEAVES_UID= - -# leaves 密钥 -LEAVES_PASSKEY= - -# ptba 用户ID -PTBA_UID= - -# ptba 密钥 -PTBA_PASSKEY= - -# icc2022 用户ID -ICC2022_UID= - -# icc2022 密钥 -ICC2022_PASSKEY= - -# xingtan 用户ID -XINGTAN_UID= - -# xingtan 密钥 -XINGTAN_PASSKEY= - -# ptvicomo 用户ID -PTVICOMO_UID= - -# ptvicomo 密钥 -PTVICOMO_PASSKEY= - -# agsvpt 用户ID -AGSVPT_UID= - -# agsvpt 密钥 -AGSVPT_PASSKEY= - -# hdkyl 用户ID -HDKYL_UID= - -# hdkyl 密钥 -HDKYL_PASSKEY= - -# qingwa 用户ID -QINGWA_UID= - -# qingwa 密钥 -QINGWA_PASSKEY= - -# discfan 用户ID -DISCFAN_UID= - -# discfan 密钥 -DISCFAN_PASSKEY= - -# rousi 用户ID -ROUSI_UID= - -# rousi 密钥 -ROUSI_PASSKEY= - diff --git a/dockge/movie-pilot/docker-compose.yml b/dockge/movie-pilot/docker-compose.yml index 1e72340a..f02442a0 100644 --- a/dockge/movie-pilot/docker-compose.yml +++ b/dockge/movie-pilot/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - movie-pilot: + movie-pilot-v2: container_name: movie-pilot env_file: - ./envs/global.env @@ -14,7 +14,9 @@ services: - PUID=0 - PGID=0 - UMASK=022 - image: jxxghp/moviepilot:1.9.17 + - HTTP_PROXY=${PROXY_HOST} + - HTTPS_PROXY=${PROXY_HOST} + image: jxxghp/moviepilot-v2:2.2.4 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot/envs/movie-pilot.env b/dockge/movie-pilot/envs/movie-pilot.env index d244ac86..78ba50bf 100644 --- a/dockge/movie-pilot/envs/movie-pilot.env +++ b/dockge/movie-pilot/envs/movie-pilot.env @@ -7,19 +7,33 @@ HOST=0.0.0.0 DEBUG=false # 是否开发模式，打开后后台服务将不会启动 DEV=false +# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG +LOG_LEVEL=INFO +# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 +DB_POOL_SIZE=100 +# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 +DB_MAX_OVERFLOW=500 +# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 +DB_TIMEOUT=60 # 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） SUPERUSER=admin +# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 +AUXILIARY_AUTH_ENABLE=false # 大内存模式，开启后会增加缓存数量，但会占用更多内存 BIG_MEMORY_MODE=false # 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 DOH_ENABLE=true +# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 +DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org +# DOH 解析服务器列表，多个服务器使用`,`分隔 +DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 # 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 META_CACHE_EXPIRE=0 # 自动检查和更新站点资源包（索引、认证等） AUTO_UPDATE_RESOURCE=true -# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 -API_TOKEN=moviepilot -# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org +# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 +API_TOKEN='' +# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org WALLPAPER=tmdb # TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` TMDB_IMAGE_DOMAIN=image.tmdb.org @@ -47,7 +61,3 @@ OCR_HOST=https://movie-pilot.org PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins # 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 SEARCH_MULTIPLE_NAME=true - - -# 自定义配置 -AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/dockge/movie-pilot_1_9_17/.env b/dockge/movie-pilot_1_9_17/.env new file mode 100644 index 00000000..a66ae0c6 --- /dev/null +++ b/dockge/movie-pilot_1_9_17/.env @@ -0,0 +1,138 @@ +# 数据持久化路径 [必填] +MOVIEPILOT_ROOT_PATH=/home/movie-pilot + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + +# API 端口 [必填] +PANEL_APP_PORT_API=3001 + +# 管理员用户名 [必填] +SUPERUSER=admin + +# API 令牌 [必填] +API_TOKEN=moviepilot + +# 网络代理 +PROXY_HOST= + +# 自动更新资源包 [必填] +AUTO_UPDATE_RESOURCES=false + +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + +# IYUU登录令牌 +IYUU_SIGN= + +# hhclub 用户名 +HHCLUB_USERNAME= + +# hhclub 密钥 +HHCLUB_PASSKEY= + +# audiences 用户ID +AUDIENCES_UID= + +# audiences 密钥 +AUDIENCES_PASSKEY= + +# hddolby 用户ID +HDDOLBY_ID= + +# hddolby 密钥 +HDDOLBY_PASSKEY= + +# zmpt 用户ID +ZMPT_UID= + +# zmpt 密钥 +ZMPT_PASSKEY= + +# freefarm 用户ID +FREEFARM_UID= + +# freefarm 密钥 +FREEFARM_PASSKEY= + +# hdfans 用户ID +HDFANS_UID= + +# hdfans 密钥 +HDFANS_PASSKEY= + +# wintersakura 用户ID +WINTERSAKURA_UID= + +# wintersakura 密钥 +WINTERSAKURA_PASSKEY= + +# leaves 用户ID +LEAVES_UID= + +# leaves 密钥 +LEAVES_PASSKEY= + +# ptba 用户ID +PTBA_UID= + +# ptba 密钥 +PTBA_PASSKEY= + +# icc2022 用户ID +ICC2022_UID= + +# icc2022 密钥 +ICC2022_PASSKEY= + +# xingtan 用户ID +XINGTAN_UID= + +# xingtan 密钥 +XINGTAN_PASSKEY= + +# ptvicomo 用户ID +PTVICOMO_UID= + +# ptvicomo 密钥 +PTVICOMO_PASSKEY= + +# agsvpt 用户ID +AGSVPT_UID= + +# agsvpt 密钥 +AGSVPT_PASSKEY= + +# hdkyl 用户ID +HDKYL_UID= + +# hdkyl 密钥 +HDKYL_PASSKEY= + +# qingwa 用户ID +QINGWA_UID= + +# qingwa 密钥 +QINGWA_PASSKEY= + +# discfan 用户ID +DISCFAN_UID= + +# discfan 密钥 +DISCFAN_PASSKEY= + +# rousi 用户ID +ROUSI_UID= + +# rousi 密钥 +ROUSI_PASSKEY= + diff --git a/dockge/movie-pilot_2_2_4/docker-compose.yml b/dockge/movie-pilot_1_9_17/docker-compose.yml similarity index 89% rename from dockge/movie-pilot_2_2_4/docker-compose.yml rename to dockge/movie-pilot_1_9_17/docker-compose.yml index f02442a0..1e72340a 100644 --- a/dockge/movie-pilot_2_2_4/docker-compose.yml +++ b/dockge/movie-pilot_1_9_17/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - movie-pilot-v2: + movie-pilot: container_name: movie-pilot env_file: - ./envs/global.env @@ -14,9 +14,7 @@ services: - PUID=0 - PGID=0 - UMASK=022 - - HTTP_PROXY=${PROXY_HOST} - - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.2.4 + image: jxxghp/moviepilot:1.9.17 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot_2_2_4/envs/default.env b/dockge/movie-pilot_1_9_17/envs/default.env similarity index 100% rename from dockge/movie-pilot_2_2_4/envs/default.env rename to dockge/movie-pilot_1_9_17/envs/default.env diff --git a/dockge/movie-pilot_2_2_4/envs/global.env b/dockge/movie-pilot_1_9_17/envs/global.env similarity index 100% rename from dockge/movie-pilot_2_2_4/envs/global.env rename to dockge/movie-pilot_1_9_17/envs/global.env diff --git a/dockge/movie-pilot_2_2_4/envs/movie-pilot.env b/dockge/movie-pilot_1_9_17/envs/movie-pilot.env similarity index 75% rename from dockge/movie-pilot_2_2_4/envs/movie-pilot.env rename to dockge/movie-pilot_1_9_17/envs/movie-pilot.env index 78ba50bf..d244ac86 100644 --- a/dockge/movie-pilot_2_2_4/envs/movie-pilot.env +++ b/dockge/movie-pilot_1_9_17/envs/movie-pilot.env @@ -7,33 +7,19 @@ HOST=0.0.0.0 DEBUG=false # 是否开发模式，打开后后台服务将不会启动 DEV=false -# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG -LOG_LEVEL=INFO -# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 -DB_POOL_SIZE=100 -# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 -DB_MAX_OVERFLOW=500 -# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 -DB_TIMEOUT=60 # 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） SUPERUSER=admin -# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 -AUXILIARY_AUTH_ENABLE=false # 大内存模式，开启后会增加缓存数量，但会占用更多内存 BIG_MEMORY_MODE=false # 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 DOH_ENABLE=true -# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 -DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org -# DOH 解析服务器列表，多个服务器使用`,`分隔 -DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 # 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 META_CACHE_EXPIRE=0 # 自动检查和更新站点资源包（索引、认证等） AUTO_UPDATE_RESOURCE=true -# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 -API_TOKEN='' -# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org +# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 +API_TOKEN=moviepilot +# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org WALLPAPER=tmdb # TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` TMDB_IMAGE_DOMAIN=image.tmdb.org @@ -61,3 +47,7 @@ OCR_HOST=https://movie-pilot.org PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins # 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 SEARCH_MULTIPLE_NAME=true + + +# 自定义配置 +AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/dockge/movie-pilot_2_2_4/.env b/dockge/movie-pilot_2_2_4/.env deleted file mode 100644 index f2b00857..00000000 --- a/dockge/movie-pilot_2_2_4/.env +++ /dev/null @@ -1,33 +0,0 @@ -# 数据持久化路径 [必填] -MOVIEPILOT_ROOT_PATH=/home/movie-pilot - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3000 - -# API 端口 [必填] -PANEL_APP_PORT_API=3001 - -# 管理员用户名 [必填] -SUPERUSER=admin - -# API 令牌 [必填] -API_TOKEN=moviepilot - -# 网络代理 -PROXY_HOST= - -# 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCE=false - -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - -# IYUU登录令牌 -IYUU_SIGN= - diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 9a027a33..a2dd1ec2 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.0 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos/init/mysql-schema.sql b/dockge/nacos/init/mysql-schema.sql index e591aa98..067d67a1 100644 --- a/dockge/nacos/init/mysql-schema.sql +++ b/dockge/nacos/init/mysql-schema.sql @@ -20,50 +20,43 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info since 2.5.0 */ +/* 表名称 = config_info_aggr */ /******************************************/ -CREATE TABLE `config_info_gray` +CREATE TABLE `config_info_aggr` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `src_user` text COMMENT 'src_user', - `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', - `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', - `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', - `gray_rule` text NOT NULL COMMENT 'gray_rule', - `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), - KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), - KEY `idx_gmt_modified` (`gmt_modified`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + /******************************************/ /* 表名称 = config_info_beta */ @@ -71,18 +64,18 @@ CREATE TABLE `config_info_gray` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -151,21 +144,18 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', - `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', - `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -229,3 +219,9 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/nacos_2_4_3/.env b/dockge/nacos_2_5_0/.env similarity index 100% rename from dockge/nacos_2_4_3/.env rename to dockge/nacos_2_5_0/.env diff --git a/dockge/nacos_2_4_3/docker-compose.yml b/dockge/nacos_2_5_0/docker-compose.yml similarity index 94% rename from dockge/nacos_2_4_3/docker-compose.yml rename to dockge/nacos_2_5_0/docker-compose.yml index a2dd1ec2..9a027a33 100644 --- a/dockge/nacos_2_4_3/docker-compose.yml +++ b/dockge/nacos_2_5_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_4_3/envs/default.env b/dockge/nacos_2_5_0/envs/default.env similarity index 100% rename from dockge/nacos_2_4_3/envs/default.env rename to dockge/nacos_2_5_0/envs/default.env diff --git a/dockge/nacos_2_4_3/envs/global.env b/dockge/nacos_2_5_0/envs/global.env similarity index 100% rename from dockge/nacos_2_4_3/envs/global.env rename to dockge/nacos_2_5_0/envs/global.env diff --git a/dockge/nacos_2_4_3/init/mysql-schema.sql b/dockge/nacos_2_5_0/init/mysql-schema.sql similarity index 68% rename from dockge/nacos_2_4_3/init/mysql-schema.sql rename to dockge/nacos_2_5_0/init/mysql-schema.sql index 067d67a1..e591aa98 100644 --- a/dockge/nacos_2_4_3/init/mysql-schema.sql +++ b/dockge/nacos_2_5_0/init/mysql-schema.sql @@ -20,43 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_info_beta */ @@ -64,18 +71,18 @@ CREATE TABLE `config_info_aggr` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -144,18 +151,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +229,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index a02df308..53121747 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-vectors-postgresql + container_name: pg16-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: tensorchord/pgvecto-rs:pg14-v0.2.1 + image: postgres:16 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg16/.env b/dockge/postgresql_pg14-vectors/.env similarity index 100% rename from dockge/postgresql_pg16/.env rename to dockge/postgresql_pg14-vectors/.env diff --git a/dockge/postgresql_pg16/docker-compose.yml b/dockge/postgresql_pg14-vectors/docker-compose.yml similarity index 85% rename from dockge/postgresql_pg16/docker-compose.yml rename to dockge/postgresql_pg14-vectors/docker-compose.yml index 53121747..a02df308 100644 --- a/dockge/postgresql_pg16/docker-compose.yml +++ b/dockge/postgresql_pg14-vectors/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-postgresql + container_name: pg14-vectors-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:16 + image: tensorchord/pgvecto-rs:pg14-v0.2.1 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg16/envs/default.env b/dockge/postgresql_pg14-vectors/envs/default.env similarity index 100% rename from dockge/postgresql_pg16/envs/default.env rename to dockge/postgresql_pg14-vectors/envs/default.env diff --git a/dockge/postgresql_pg16/envs/global.env b/dockge/postgresql_pg14-vectors/envs/global.env similarity index 100% rename from dockge/postgresql_pg16/envs/global.env rename to dockge/postgresql_pg14-vectors/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 18db6192..5ec4b458 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.0.3 + 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_0_3/.env similarity index 100% rename from dockge/qbittorrent_4_6_7/.env rename to dockge/qbittorrent_5_0_3/.env diff --git a/dockge/qbittorrent_4_6_7/docker-compose.yml b/dockge/qbittorrent_5_0_3/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_4_6_7/docker-compose.yml rename to dockge/qbittorrent_5_0_3/docker-compose.yml index 5ec4b458..18db6192 100644 --- a/dockge/qbittorrent_4_6_7/docker-compose.yml +++ b/dockge/qbittorrent_5_0_3/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.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/envs/default.env b/dockge/qbittorrent_5_0_3/envs/default.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/default.env rename to dockge/qbittorrent_5_0_3/envs/default.env diff --git a/dockge/qbittorrent_4_6_7/envs/global.env b/dockge/qbittorrent_5_0_3/envs/global.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/global.env rename to dockge/qbittorrent_5_0_3/envs/global.env From f03ad3d6e79dca1564f9c13bb8ee325332cdbc43 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 23 Jan 2025 12:37:17 +0000 Subject: [PATCH 16/29] Processed apps directory via GitHub Actions --- dockge/movie-pilot/.env | 107 +++++++++++++- dockge/movie-pilot/docker-compose.yml | 6 +- dockge/movie-pilot/envs/movie-pilot.env | 24 +-- dockge/movie-pilot_1_9_17/.env | 138 ------------------ dockge/movie-pilot_2_2_4/.env | 33 +++++ .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 .../envs/movie-pilot.env | 24 ++- dockge/nacos/docker-compose.yml | 2 +- dockge/nacos/init/mysql-schema.sql | 114 ++++++++------- dockge/{nacos_2_5_0 => nacos_2_4_3}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 114 +++++++-------- 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 26 files changed, 291 insertions(+), 291 deletions(-) delete mode 100644 dockge/movie-pilot_1_9_17/.env create mode 100644 dockge/movie-pilot_2_2_4/.env rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/docker-compose.yml (89%) rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/envs/default.env (100%) rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/envs/global.env (100%) rename dockge/{movie-pilot_1_9_17 => movie-pilot_2_2_4}/envs/movie-pilot.env (75%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/.env (100%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/docker-compose.yml (94%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/envs/default.env (100%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/envs/global.env (100%) rename dockge/{nacos_2_5_0 => nacos_2_4_3}/init/mysql-schema.sql (68%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/.env (100%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/docker-compose.yml (85%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/envs/default.env (100%) rename dockge/{postgresql_pg14-vectors => postgresql_pg16}/envs/global.env (100%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/.env (100%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/docker-compose.yml (95%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/envs/default.env (100%) rename dockge/{qbittorrent_5_0_3 => qbittorrent_4_6_7}/envs/global.env (100%) diff --git a/dockge/movie-pilot/.env b/dockge/movie-pilot/.env index f2b00857..a66ae0c6 100644 --- a/dockge/movie-pilot/.env +++ b/dockge/movie-pilot/.env @@ -17,7 +17,10 @@ API_TOKEN=moviepilot PROXY_HOST= # 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCE=false +AUTO_UPDATE_RESOURCES=false + +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= @@ -31,3 +34,105 @@ CUSTOM_MOUNT_DIRECTORY_3= # IYUU登录令牌 IYUU_SIGN= +# hhclub 用户名 +HHCLUB_USERNAME= + +# hhclub 密钥 +HHCLUB_PASSKEY= + +# audiences 用户ID +AUDIENCES_UID= + +# audiences 密钥 +AUDIENCES_PASSKEY= + +# hddolby 用户ID +HDDOLBY_ID= + +# hddolby 密钥 +HDDOLBY_PASSKEY= + +# zmpt 用户ID +ZMPT_UID= + +# zmpt 密钥 +ZMPT_PASSKEY= + +# freefarm 用户ID +FREEFARM_UID= + +# freefarm 密钥 +FREEFARM_PASSKEY= + +# hdfans 用户ID +HDFANS_UID= + +# hdfans 密钥 +HDFANS_PASSKEY= + +# wintersakura 用户ID +WINTERSAKURA_UID= + +# wintersakura 密钥 +WINTERSAKURA_PASSKEY= + +# leaves 用户ID +LEAVES_UID= + +# leaves 密钥 +LEAVES_PASSKEY= + +# ptba 用户ID +PTBA_UID= + +# ptba 密钥 +PTBA_PASSKEY= + +# icc2022 用户ID +ICC2022_UID= + +# icc2022 密钥 +ICC2022_PASSKEY= + +# xingtan 用户ID +XINGTAN_UID= + +# xingtan 密钥 +XINGTAN_PASSKEY= + +# ptvicomo 用户ID +PTVICOMO_UID= + +# ptvicomo 密钥 +PTVICOMO_PASSKEY= + +# agsvpt 用户ID +AGSVPT_UID= + +# agsvpt 密钥 +AGSVPT_PASSKEY= + +# hdkyl 用户ID +HDKYL_UID= + +# hdkyl 密钥 +HDKYL_PASSKEY= + +# qingwa 用户ID +QINGWA_UID= + +# qingwa 密钥 +QINGWA_PASSKEY= + +# discfan 用户ID +DISCFAN_UID= + +# discfan 密钥 +DISCFAN_PASSKEY= + +# rousi 用户ID +ROUSI_UID= + +# rousi 密钥 +ROUSI_PASSKEY= + diff --git a/dockge/movie-pilot/docker-compose.yml b/dockge/movie-pilot/docker-compose.yml index f02442a0..1e72340a 100644 --- a/dockge/movie-pilot/docker-compose.yml +++ b/dockge/movie-pilot/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - movie-pilot-v2: + movie-pilot: container_name: movie-pilot env_file: - ./envs/global.env @@ -14,9 +14,7 @@ services: - PUID=0 - PGID=0 - UMASK=022 - - HTTP_PROXY=${PROXY_HOST} - - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.2.4 + image: jxxghp/moviepilot:1.9.17 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot/envs/movie-pilot.env b/dockge/movie-pilot/envs/movie-pilot.env index 78ba50bf..d244ac86 100644 --- a/dockge/movie-pilot/envs/movie-pilot.env +++ b/dockge/movie-pilot/envs/movie-pilot.env @@ -7,33 +7,19 @@ HOST=0.0.0.0 DEBUG=false # 是否开发模式，打开后后台服务将不会启动 DEV=false -# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG -LOG_LEVEL=INFO -# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 -DB_POOL_SIZE=100 -# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 -DB_MAX_OVERFLOW=500 -# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 -DB_TIMEOUT=60 # 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） SUPERUSER=admin -# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 -AUXILIARY_AUTH_ENABLE=false # 大内存模式，开启后会增加缓存数量，但会占用更多内存 BIG_MEMORY_MODE=false # 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 DOH_ENABLE=true -# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 -DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org -# DOH 解析服务器列表，多个服务器使用`,`分隔 -DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 # 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 META_CACHE_EXPIRE=0 # 自动检查和更新站点资源包（索引、认证等） AUTO_UPDATE_RESOURCE=true -# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 -API_TOKEN='' -# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org +# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 +API_TOKEN=moviepilot +# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org WALLPAPER=tmdb # TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` TMDB_IMAGE_DOMAIN=image.tmdb.org @@ -61,3 +47,7 @@ OCR_HOST=https://movie-pilot.org PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins # 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 SEARCH_MULTIPLE_NAME=true + + +# 自定义配置 +AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/dockge/movie-pilot_1_9_17/.env b/dockge/movie-pilot_1_9_17/.env deleted file mode 100644 index a66ae0c6..00000000 --- a/dockge/movie-pilot_1_9_17/.env +++ /dev/null @@ -1,138 +0,0 @@ -# 数据持久化路径 [必填] -MOVIEPILOT_ROOT_PATH=/home/movie-pilot - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3000 - -# API 端口 [必填] -PANEL_APP_PORT_API=3001 - -# 管理员用户名 [必填] -SUPERUSER=admin - -# API 令牌 [必填] -API_TOKEN=moviepilot - -# 网络代理 -PROXY_HOST= - -# 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCES=false - -# 自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false - -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - -# IYUU登录令牌 -IYUU_SIGN= - -# hhclub 用户名 -HHCLUB_USERNAME= - -# hhclub 密钥 -HHCLUB_PASSKEY= - -# audiences 用户ID -AUDIENCES_UID= - -# audiences 密钥 -AUDIENCES_PASSKEY= - -# hddolby 用户ID -HDDOLBY_ID= - -# hddolby 密钥 -HDDOLBY_PASSKEY= - -# zmpt 用户ID -ZMPT_UID= - -# zmpt 密钥 -ZMPT_PASSKEY= - -# freefarm 用户ID -FREEFARM_UID= - -# freefarm 密钥 -FREEFARM_PASSKEY= - -# hdfans 用户ID -HDFANS_UID= - -# hdfans 密钥 -HDFANS_PASSKEY= - -# wintersakura 用户ID -WINTERSAKURA_UID= - -# wintersakura 密钥 -WINTERSAKURA_PASSKEY= - -# leaves 用户ID -LEAVES_UID= - -# leaves 密钥 -LEAVES_PASSKEY= - -# ptba 用户ID -PTBA_UID= - -# ptba 密钥 -PTBA_PASSKEY= - -# icc2022 用户ID -ICC2022_UID= - -# icc2022 密钥 -ICC2022_PASSKEY= - -# xingtan 用户ID -XINGTAN_UID= - -# xingtan 密钥 -XINGTAN_PASSKEY= - -# ptvicomo 用户ID -PTVICOMO_UID= - -# ptvicomo 密钥 -PTVICOMO_PASSKEY= - -# agsvpt 用户ID -AGSVPT_UID= - -# agsvpt 密钥 -AGSVPT_PASSKEY= - -# hdkyl 用户ID -HDKYL_UID= - -# hdkyl 密钥 -HDKYL_PASSKEY= - -# qingwa 用户ID -QINGWA_UID= - -# qingwa 密钥 -QINGWA_PASSKEY= - -# discfan 用户ID -DISCFAN_UID= - -# discfan 密钥 -DISCFAN_PASSKEY= - -# rousi 用户ID -ROUSI_UID= - -# rousi 密钥 -ROUSI_PASSKEY= - diff --git a/dockge/movie-pilot_2_2_4/.env b/dockge/movie-pilot_2_2_4/.env new file mode 100644 index 00000000..f2b00857 --- /dev/null +++ b/dockge/movie-pilot_2_2_4/.env @@ -0,0 +1,33 @@ +# 数据持久化路径 [必填] +MOVIEPILOT_ROOT_PATH=/home/movie-pilot + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + +# API 端口 [必填] +PANEL_APP_PORT_API=3001 + +# 管理员用户名 [必填] +SUPERUSER=admin + +# API 令牌 [必填] +API_TOKEN=moviepilot + +# 网络代理 +PROXY_HOST= + +# 自动更新资源包 [必填] +AUTO_UPDATE_RESOURCE=false + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + +# IYUU登录令牌 +IYUU_SIGN= + diff --git a/dockge/movie-pilot_1_9_17/docker-compose.yml b/dockge/movie-pilot_2_2_4/docker-compose.yml similarity index 89% rename from dockge/movie-pilot_1_9_17/docker-compose.yml rename to dockge/movie-pilot_2_2_4/docker-compose.yml index 1e72340a..f02442a0 100644 --- a/dockge/movie-pilot_1_9_17/docker-compose.yml +++ b/dockge/movie-pilot_2_2_4/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - movie-pilot: + movie-pilot-v2: container_name: movie-pilot env_file: - ./envs/global.env @@ -14,7 +14,9 @@ services: - PUID=0 - PGID=0 - UMASK=022 - image: jxxghp/moviepilot:1.9.17 + - HTTP_PROXY=${PROXY_HOST} + - HTTPS_PROXY=${PROXY_HOST} + image: jxxghp/moviepilot-v2:2.2.4 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot_1_9_17/envs/default.env b/dockge/movie-pilot_2_2_4/envs/default.env similarity index 100% rename from dockge/movie-pilot_1_9_17/envs/default.env rename to dockge/movie-pilot_2_2_4/envs/default.env diff --git a/dockge/movie-pilot_1_9_17/envs/global.env b/dockge/movie-pilot_2_2_4/envs/global.env similarity index 100% rename from dockge/movie-pilot_1_9_17/envs/global.env rename to dockge/movie-pilot_2_2_4/envs/global.env diff --git a/dockge/movie-pilot_1_9_17/envs/movie-pilot.env b/dockge/movie-pilot_2_2_4/envs/movie-pilot.env similarity index 75% rename from dockge/movie-pilot_1_9_17/envs/movie-pilot.env rename to dockge/movie-pilot_2_2_4/envs/movie-pilot.env index d244ac86..78ba50bf 100644 --- a/dockge/movie-pilot_1_9_17/envs/movie-pilot.env +++ b/dockge/movie-pilot_2_2_4/envs/movie-pilot.env @@ -7,19 +7,33 @@ HOST=0.0.0.0 DEBUG=false # 是否开发模式，打开后后台服务将不会启动 DEV=false +# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG +LOG_LEVEL=INFO +# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 +DB_POOL_SIZE=100 +# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 +DB_MAX_OVERFLOW=500 +# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 +DB_TIMEOUT=60 # 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） SUPERUSER=admin +# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 +AUXILIARY_AUTH_ENABLE=false # 大内存模式，开启后会增加缓存数量，但会占用更多内存 BIG_MEMORY_MODE=false # 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 DOH_ENABLE=true +# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 +DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org +# DOH 解析服务器列表，多个服务器使用`,`分隔 +DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 # 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 META_CACHE_EXPIRE=0 # 自动检查和更新站点资源包（索引、认证等） AUTO_UPDATE_RESOURCE=true -# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 -API_TOKEN=moviepilot -# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org +# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 +API_TOKEN='' +# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org WALLPAPER=tmdb # TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` TMDB_IMAGE_DOMAIN=image.tmdb.org @@ -47,7 +61,3 @@ OCR_HOST=https://movie-pilot.org PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins # 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 SEARCH_MULTIPLE_NAME=true - - -# 自定义配置 -AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index a2dd1ec2..9a027a33 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v2.5.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos/init/mysql-schema.sql b/dockge/nacos/init/mysql-schema.sql index 067d67a1..e591aa98 100644 --- a/dockge/nacos/init/mysql-schema.sql +++ b/dockge/nacos/init/mysql-schema.sql @@ -20,43 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_info_beta */ @@ -64,18 +71,18 @@ CREATE TABLE `config_info_aggr` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -144,18 +151,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +229,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/nacos_2_5_0/.env b/dockge/nacos_2_4_3/.env similarity index 100% rename from dockge/nacos_2_5_0/.env rename to dockge/nacos_2_4_3/.env diff --git a/dockge/nacos_2_5_0/docker-compose.yml b/dockge/nacos_2_4_3/docker-compose.yml similarity index 94% rename from dockge/nacos_2_5_0/docker-compose.yml rename to dockge/nacos_2_4_3/docker-compose.yml index 9a027a33..a2dd1ec2 100644 --- a/dockge/nacos_2_5_0/docker-compose.yml +++ b/dockge/nacos_2_4_3/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=8848 - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.0 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_2_5_0/envs/default.env b/dockge/nacos_2_4_3/envs/default.env similarity index 100% rename from dockge/nacos_2_5_0/envs/default.env rename to dockge/nacos_2_4_3/envs/default.env diff --git a/dockge/nacos_2_5_0/envs/global.env b/dockge/nacos_2_4_3/envs/global.env similarity index 100% rename from dockge/nacos_2_5_0/envs/global.env rename to dockge/nacos_2_4_3/envs/global.env diff --git a/dockge/nacos_2_5_0/init/mysql-schema.sql b/dockge/nacos_2_4_3/init/mysql-schema.sql similarity index 68% rename from dockge/nacos_2_5_0/init/mysql-schema.sql rename to dockge/nacos_2_4_3/init/mysql-schema.sql index e591aa98..067d67a1 100644 --- a/dockge/nacos_2_5_0/init/mysql-schema.sql +++ b/dockge/nacos_2_4_3/init/mysql-schema.sql @@ -20,50 +20,43 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info since 2.5.0 */ +/* 表名称 = config_info_aggr */ /******************************************/ -CREATE TABLE `config_info_gray` +CREATE TABLE `config_info_aggr` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `src_user` text COMMENT 'src_user', - `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', - `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', - `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', - `gray_rule` text NOT NULL COMMENT 'gray_rule', - `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), - KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), - KEY `idx_gmt_modified` (`gmt_modified`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + /******************************************/ /* 表名称 = config_info_beta */ @@ -71,18 +64,18 @@ CREATE TABLE `config_info_gray` CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; @@ -151,21 +144,18 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', - `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', - `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -229,3 +219,9 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 53121747..a02df308 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-postgresql + container_name: pg14-vectors-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:16 + image: tensorchord/pgvecto-rs:pg14-v0.2.1 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14-vectors/.env b/dockge/postgresql_pg16/.env similarity index 100% rename from dockge/postgresql_pg14-vectors/.env rename to dockge/postgresql_pg16/.env diff --git a/dockge/postgresql_pg14-vectors/docker-compose.yml b/dockge/postgresql_pg16/docker-compose.yml similarity index 85% rename from dockge/postgresql_pg14-vectors/docker-compose.yml rename to dockge/postgresql_pg16/docker-compose.yml index a02df308..53121747 100644 --- a/dockge/postgresql_pg14-vectors/docker-compose.yml +++ b/dockge/postgresql_pg16/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-vectors-postgresql + container_name: pg16-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: tensorchord/pgvecto-rs:pg14-v0.2.1 + image: postgres:16 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg14-vectors/envs/default.env b/dockge/postgresql_pg16/envs/default.env similarity index 100% rename from dockge/postgresql_pg14-vectors/envs/default.env rename to dockge/postgresql_pg16/envs/default.env diff --git a/dockge/postgresql_pg14-vectors/envs/global.env b/dockge/postgresql_pg16/envs/global.env similarity index 100% rename from dockge/postgresql_pg14-vectors/envs/global.env rename to dockge/postgresql_pg16/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458..18db6192 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.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_0_3/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_0_3/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_0_3/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_0_3/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index 18db6192..5ec4b458 100644 --- a/dockge/qbittorrent_5_0_3/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.0.3 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_0_3/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_0_3/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/qbittorrent_5_0_3/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_0_3/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env From 5f28c2a2b954cc160e85685425cb3c14e554f30b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:38:12 +0000 Subject: [PATCH 17/29] Update svhd/logto Docker tag to v1.23.1 --- apps/logto/1.23.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/logto/1.23.0/docker-compose.yml b/apps/logto/1.23.0/docker-compose.yml index 83b7426e..481f705f 100644 --- a/apps/logto/1.23.0/docker-compose.yml +++ b/apps/logto/1.23.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: logto: - image: svhd/logto:1.23.0 + image: svhd/logto:1.23.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From ff8e0f2424156511c19fd11531f27ab23e02ac0d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 23 Jan 2025 12:38:25 +0000 Subject: [PATCH 18/29] Update app version [skip ci] --- apps/logto/{1.23.0 => 1.23.1}/data.yml | 0 apps/logto/{1.23.0 => 1.23.1}/docker-compose.yml | 0 apps/logto/{1.23.0 => 1.23.1}/envs/default.env | 0 apps/logto/{1.23.0 => 1.23.1}/envs/global.env | 0 apps/logto/{1.23.0 => 1.23.1}/scripts/init.sh | 0 apps/logto/{1.23.0 => 1.23.1}/scripts/uninstall.sh | 0 apps/logto/{1.23.0 => 1.23.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/logto/{1.23.0 => 1.23.1}/data.yml (100%) rename apps/logto/{1.23.0 => 1.23.1}/docker-compose.yml (100%) rename apps/logto/{1.23.0 => 1.23.1}/envs/default.env (100%) rename apps/logto/{1.23.0 => 1.23.1}/envs/global.env (100%) rename apps/logto/{1.23.0 => 1.23.1}/scripts/init.sh (100%) rename apps/logto/{1.23.0 => 1.23.1}/scripts/uninstall.sh (100%) rename apps/logto/{1.23.0 => 1.23.1}/scripts/upgrade.sh (100%) diff --git a/apps/logto/1.23.0/data.yml b/apps/logto/1.23.1/data.yml similarity index 100% rename from apps/logto/1.23.0/data.yml rename to apps/logto/1.23.1/data.yml diff --git a/apps/logto/1.23.0/docker-compose.yml b/apps/logto/1.23.1/docker-compose.yml similarity index 100% rename from apps/logto/1.23.0/docker-compose.yml rename to apps/logto/1.23.1/docker-compose.yml diff --git a/apps/logto/1.23.0/envs/default.env b/apps/logto/1.23.1/envs/default.env similarity index 100% rename from apps/logto/1.23.0/envs/default.env rename to apps/logto/1.23.1/envs/default.env diff --git a/apps/logto/1.23.0/envs/global.env b/apps/logto/1.23.1/envs/global.env similarity index 100% rename from apps/logto/1.23.0/envs/global.env rename to apps/logto/1.23.1/envs/global.env diff --git a/apps/logto/1.23.0/scripts/init.sh b/apps/logto/1.23.1/scripts/init.sh similarity index 100% rename from apps/logto/1.23.0/scripts/init.sh rename to apps/logto/1.23.1/scripts/init.sh diff --git a/apps/logto/1.23.0/scripts/uninstall.sh b/apps/logto/1.23.1/scripts/uninstall.sh similarity index 100% rename from apps/logto/1.23.0/scripts/uninstall.sh rename to apps/logto/1.23.1/scripts/uninstall.sh diff --git a/apps/logto/1.23.0/scripts/upgrade.sh b/apps/logto/1.23.1/scripts/upgrade.sh similarity index 100% rename from apps/logto/1.23.0/scripts/upgrade.sh rename to apps/logto/1.23.1/scripts/upgrade.sh From a21c0b3f9dc57728746c60ef43550bfdf28a8246 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:34:56 +0000 Subject: [PATCH 19/29] Update diygod/rsshub Docker tag to v2025-01-23 --- apps/rsshub/2025-01-22/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/rsshub/2025-01-22/docker-compose.yml b/apps/rsshub/2025-01-22/docker-compose.yml index af1d3d9a..5a8245a3 100644 --- a/apps/rsshub/2025-01-22/docker-compose.yml +++ b/apps/rsshub/2025-01-22/docker-compose.yml @@ -23,7 +23,7 @@ services: timeout: 10s retries: 3 rsshub: - image: diygod/rsshub:2025-01-22 + image: diygod/rsshub:2025-01-23 container_name: rsshub-${CONTAINER_NAME} depends_on: - browserless From bb87acce69ef568b119e50fb93f9e26d24d1cc83 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 23 Jan 2025 22:35:10 +0000 Subject: [PATCH 20/29] Update app version [skip ci] --- apps/rsshub/{2025-01-22 => 2025-01-23}/data.yml | 0 apps/rsshub/{2025-01-22 => 2025-01-23}/docker-compose.yml | 0 apps/rsshub/{2025-01-22 => 2025-01-23}/envs/default.env | 0 apps/rsshub/{2025-01-22 => 2025-01-23}/envs/global.env | 0 apps/rsshub/{2025-01-22 => 2025-01-23}/scripts/init.sh | 0 apps/rsshub/{2025-01-22 => 2025-01-23}/scripts/uninstall.sh | 0 apps/rsshub/{2025-01-22 => 2025-01-23}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/rsshub/{2025-01-22 => 2025-01-23}/data.yml (100%) rename apps/rsshub/{2025-01-22 => 2025-01-23}/docker-compose.yml (100%) rename apps/rsshub/{2025-01-22 => 2025-01-23}/envs/default.env (100%) rename apps/rsshub/{2025-01-22 => 2025-01-23}/envs/global.env (100%) rename apps/rsshub/{2025-01-22 => 2025-01-23}/scripts/init.sh (100%) rename apps/rsshub/{2025-01-22 => 2025-01-23}/scripts/uninstall.sh (100%) rename apps/rsshub/{2025-01-22 => 2025-01-23}/scripts/upgrade.sh (100%) diff --git a/apps/rsshub/2025-01-22/data.yml b/apps/rsshub/2025-01-23/data.yml similarity index 100% rename from apps/rsshub/2025-01-22/data.yml rename to apps/rsshub/2025-01-23/data.yml diff --git a/apps/rsshub/2025-01-22/docker-compose.yml b/apps/rsshub/2025-01-23/docker-compose.yml similarity index 100% rename from apps/rsshub/2025-01-22/docker-compose.yml rename to apps/rsshub/2025-01-23/docker-compose.yml diff --git a/apps/rsshub/2025-01-22/envs/default.env b/apps/rsshub/2025-01-23/envs/default.env similarity index 100% rename from apps/rsshub/2025-01-22/envs/default.env rename to apps/rsshub/2025-01-23/envs/default.env diff --git a/apps/rsshub/2025-01-22/envs/global.env b/apps/rsshub/2025-01-23/envs/global.env similarity index 100% rename from apps/rsshub/2025-01-22/envs/global.env rename to apps/rsshub/2025-01-23/envs/global.env diff --git a/apps/rsshub/2025-01-22/scripts/init.sh b/apps/rsshub/2025-01-23/scripts/init.sh similarity index 100% rename from apps/rsshub/2025-01-22/scripts/init.sh rename to apps/rsshub/2025-01-23/scripts/init.sh diff --git a/apps/rsshub/2025-01-22/scripts/uninstall.sh b/apps/rsshub/2025-01-23/scripts/uninstall.sh similarity index 100% rename from apps/rsshub/2025-01-22/scripts/uninstall.sh rename to apps/rsshub/2025-01-23/scripts/uninstall.sh diff --git a/apps/rsshub/2025-01-22/scripts/upgrade.sh b/apps/rsshub/2025-01-23/scripts/upgrade.sh similarity index 100% rename from apps/rsshub/2025-01-22/scripts/upgrade.sh rename to apps/rsshub/2025-01-23/scripts/upgrade.sh From 670957e597c103af74142bc113c5381877bcf17b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:41:55 +0000 Subject: [PATCH 21/29] Update ghcr.io/immich-app/immich-server Docker tag to v1.125.1 --- apps/immich-no-machine/1.124.2/docker-compose.yml | 2 +- apps/immich-server/1.124.2/docker-compose.yml | 2 +- apps/immich/1.124.2/docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/immich-no-machine/1.124.2/docker-compose.yml b/apps/immich-no-machine/1.124.2/docker-compose.yml index e23bf343..04d5c10d 100644 --- a/apps/immich-no-machine/1.124.2/docker-compose.yml +++ b/apps/immich-no-machine/1.124.2/docker-compose.yml @@ -47,7 +47,7 @@ services: immich-server: depends_on: - immich-pg14-vectors - image: ghcr.io/immich-app/immich-server:v1.124.2 + image: ghcr.io/immich-app/immich-server:v1.125.1 container_name: immich-server-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich-server/1.124.2/docker-compose.yml b/apps/immich-server/1.124.2/docker-compose.yml index bbb22693..4835cee5 100644 --- a/apps/immich-server/1.124.2/docker-compose.yml +++ b/apps/immich-server/1.124.2/docker-compose.yml @@ -6,7 +6,7 @@ name: immich-server services: immich-server: - image: ghcr.io/immich-app/immich-server:v1.124.2 + image: ghcr.io/immich-app/immich-server:v1.125.1 container_name: immich-server-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich/1.124.2/docker-compose.yml b/apps/immich/1.124.2/docker-compose.yml index b7074066..0f260218 100644 --- a/apps/immich/1.124.2/docker-compose.yml +++ b/apps/immich/1.124.2/docker-compose.yml @@ -47,7 +47,7 @@ services: immich-server: depends_on: - immich-pg14-vectors - image: ghcr.io/immich-app/immich-server:v1.124.2 + image: ghcr.io/immich-app/immich-server:v1.125.1 container_name: immich-server-${CONTAINER_NAME} labels: createdBy: "Apps" From f7a0558120871e69d129c6e685f4d7abc984913c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:41:58 +0000 Subject: [PATCH 22/29] Update hamster1963/nezha-dash Docker tag to v2.4.0 --- apps/nezha-dash/2.3.0/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nezha-dash/2.3.0/docker-compose.yml b/apps/nezha-dash/2.3.0/docker-compose.yml index 4e29031b..5f422409 100644 --- a/apps/nezha-dash/2.3.0/docker-compose.yml +++ b/apps/nezha-dash/2.3.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha-dash: - image: hamster1963/nezha-dash:v2.3.0 + image: hamster1963/nezha-dash:v2.4.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 6cac6af33381d0ae54d812c53c1308e57cf5b48b Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 24 Jan 2025 00:42:07 +0000 Subject: [PATCH 23/29] Update app version [skip ci] --- apps/immich-no-machine/{1.124.2 => 1.125.1}/data.yml | 0 apps/immich-no-machine/{1.124.2 => 1.125.1}/docker-compose.yml | 0 apps/immich-no-machine/{1.124.2 => 1.125.1}/envs/default.env | 0 apps/immich-no-machine/{1.124.2 => 1.125.1}/envs/global.env | 0 apps/immich-no-machine/{1.124.2 => 1.125.1}/scripts/init.sh | 0 apps/immich-no-machine/{1.124.2 => 1.125.1}/scripts/uninstall.sh | 0 apps/immich-no-machine/{1.124.2 => 1.125.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/data.yml (100%) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/docker-compose.yml (100%) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/envs/default.env (100%) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/envs/global.env (100%) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/scripts/init.sh (100%) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/scripts/uninstall.sh (100%) rename apps/immich-no-machine/{1.124.2 => 1.125.1}/scripts/upgrade.sh (100%) diff --git a/apps/immich-no-machine/1.124.2/data.yml b/apps/immich-no-machine/1.125.1/data.yml similarity index 100% rename from apps/immich-no-machine/1.124.2/data.yml rename to apps/immich-no-machine/1.125.1/data.yml diff --git a/apps/immich-no-machine/1.124.2/docker-compose.yml b/apps/immich-no-machine/1.125.1/docker-compose.yml similarity index 100% rename from apps/immich-no-machine/1.124.2/docker-compose.yml rename to apps/immich-no-machine/1.125.1/docker-compose.yml diff --git a/apps/immich-no-machine/1.124.2/envs/default.env b/apps/immich-no-machine/1.125.1/envs/default.env similarity index 100% rename from apps/immich-no-machine/1.124.2/envs/default.env rename to apps/immich-no-machine/1.125.1/envs/default.env diff --git a/apps/immich-no-machine/1.124.2/envs/global.env b/apps/immich-no-machine/1.125.1/envs/global.env similarity index 100% rename from apps/immich-no-machine/1.124.2/envs/global.env rename to apps/immich-no-machine/1.125.1/envs/global.env diff --git a/apps/immich-no-machine/1.124.2/scripts/init.sh b/apps/immich-no-machine/1.125.1/scripts/init.sh similarity index 100% rename from apps/immich-no-machine/1.124.2/scripts/init.sh rename to apps/immich-no-machine/1.125.1/scripts/init.sh diff --git a/apps/immich-no-machine/1.124.2/scripts/uninstall.sh b/apps/immich-no-machine/1.125.1/scripts/uninstall.sh similarity index 100% rename from apps/immich-no-machine/1.124.2/scripts/uninstall.sh rename to apps/immich-no-machine/1.125.1/scripts/uninstall.sh diff --git a/apps/immich-no-machine/1.124.2/scripts/upgrade.sh b/apps/immich-no-machine/1.125.1/scripts/upgrade.sh similarity index 100% rename from apps/immich-no-machine/1.124.2/scripts/upgrade.sh rename to apps/immich-no-machine/1.125.1/scripts/upgrade.sh From d4c3d11a473ce9b2066bdbd308ebcd00a295c97d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 24 Jan 2025 00:42:07 +0000 Subject: [PATCH 24/29] Update app version [skip ci] --- apps/immich-server/{1.124.2 => 1.125.1}/data.yml | 0 apps/immich-server/{1.124.2 => 1.125.1}/docker-compose.yml | 0 apps/immich-server/{1.124.2 => 1.125.1}/envs/default.env | 0 apps/immich-server/{1.124.2 => 1.125.1}/envs/global.env | 0 apps/immich-server/{1.124.2 => 1.125.1}/scripts/init.sh | 0 apps/immich-server/{1.124.2 => 1.125.1}/scripts/uninstall.sh | 0 apps/immich-server/{1.124.2 => 1.125.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich-server/{1.124.2 => 1.125.1}/data.yml (100%) rename apps/immich-server/{1.124.2 => 1.125.1}/docker-compose.yml (100%) rename apps/immich-server/{1.124.2 => 1.125.1}/envs/default.env (100%) rename apps/immich-server/{1.124.2 => 1.125.1}/envs/global.env (100%) rename apps/immich-server/{1.124.2 => 1.125.1}/scripts/init.sh (100%) rename apps/immich-server/{1.124.2 => 1.125.1}/scripts/uninstall.sh (100%) rename apps/immich-server/{1.124.2 => 1.125.1}/scripts/upgrade.sh (100%) diff --git a/apps/immich-server/1.124.2/data.yml b/apps/immich-server/1.125.1/data.yml similarity index 100% rename from apps/immich-server/1.124.2/data.yml rename to apps/immich-server/1.125.1/data.yml diff --git a/apps/immich-server/1.124.2/docker-compose.yml b/apps/immich-server/1.125.1/docker-compose.yml similarity index 100% rename from apps/immich-server/1.124.2/docker-compose.yml rename to apps/immich-server/1.125.1/docker-compose.yml diff --git a/apps/immich-server/1.124.2/envs/default.env b/apps/immich-server/1.125.1/envs/default.env similarity index 100% rename from apps/immich-server/1.124.2/envs/default.env rename to apps/immich-server/1.125.1/envs/default.env diff --git a/apps/immich-server/1.124.2/envs/global.env b/apps/immich-server/1.125.1/envs/global.env similarity index 100% rename from apps/immich-server/1.124.2/envs/global.env rename to apps/immich-server/1.125.1/envs/global.env diff --git a/apps/immich-server/1.124.2/scripts/init.sh b/apps/immich-server/1.125.1/scripts/init.sh similarity index 100% rename from apps/immich-server/1.124.2/scripts/init.sh rename to apps/immich-server/1.125.1/scripts/init.sh diff --git a/apps/immich-server/1.124.2/scripts/uninstall.sh b/apps/immich-server/1.125.1/scripts/uninstall.sh similarity index 100% rename from apps/immich-server/1.124.2/scripts/uninstall.sh rename to apps/immich-server/1.125.1/scripts/uninstall.sh diff --git a/apps/immich-server/1.124.2/scripts/upgrade.sh b/apps/immich-server/1.125.1/scripts/upgrade.sh similarity index 100% rename from apps/immich-server/1.124.2/scripts/upgrade.sh rename to apps/immich-server/1.125.1/scripts/upgrade.sh From cdcba5d813bf916e6cca0c26cacf7b5d4ceb8741 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 24 Jan 2025 00:42:10 +0000 Subject: [PATCH 25/29] Update app version [skip ci] --- apps/nezha-dash/{2.3.0 => 2.4.0}/data.yml | 0 apps/nezha-dash/{2.3.0 => 2.4.0}/docker-compose.yml | 0 apps/nezha-dash/{2.3.0 => 2.4.0}/envs/default.env | 0 apps/nezha-dash/{2.3.0 => 2.4.0}/envs/global.env | 0 apps/nezha-dash/{2.3.0 => 2.4.0}/scripts/init.sh | 0 apps/nezha-dash/{2.3.0 => 2.4.0}/scripts/uninstall.sh | 0 apps/nezha-dash/{2.3.0 => 2.4.0}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/nezha-dash/{2.3.0 => 2.4.0}/data.yml (100%) rename apps/nezha-dash/{2.3.0 => 2.4.0}/docker-compose.yml (100%) rename apps/nezha-dash/{2.3.0 => 2.4.0}/envs/default.env (100%) rename apps/nezha-dash/{2.3.0 => 2.4.0}/envs/global.env (100%) rename apps/nezha-dash/{2.3.0 => 2.4.0}/scripts/init.sh (100%) rename apps/nezha-dash/{2.3.0 => 2.4.0}/scripts/uninstall.sh (100%) rename apps/nezha-dash/{2.3.0 => 2.4.0}/scripts/upgrade.sh (100%) diff --git a/apps/nezha-dash/2.3.0/data.yml b/apps/nezha-dash/2.4.0/data.yml similarity index 100% rename from apps/nezha-dash/2.3.0/data.yml rename to apps/nezha-dash/2.4.0/data.yml diff --git a/apps/nezha-dash/2.3.0/docker-compose.yml b/apps/nezha-dash/2.4.0/docker-compose.yml similarity index 100% rename from apps/nezha-dash/2.3.0/docker-compose.yml rename to apps/nezha-dash/2.4.0/docker-compose.yml diff --git a/apps/nezha-dash/2.3.0/envs/default.env b/apps/nezha-dash/2.4.0/envs/default.env similarity index 100% rename from apps/nezha-dash/2.3.0/envs/default.env rename to apps/nezha-dash/2.4.0/envs/default.env diff --git a/apps/nezha-dash/2.3.0/envs/global.env b/apps/nezha-dash/2.4.0/envs/global.env similarity index 100% rename from apps/nezha-dash/2.3.0/envs/global.env rename to apps/nezha-dash/2.4.0/envs/global.env diff --git a/apps/nezha-dash/2.3.0/scripts/init.sh b/apps/nezha-dash/2.4.0/scripts/init.sh similarity index 100% rename from apps/nezha-dash/2.3.0/scripts/init.sh rename to apps/nezha-dash/2.4.0/scripts/init.sh diff --git a/apps/nezha-dash/2.3.0/scripts/uninstall.sh b/apps/nezha-dash/2.4.0/scripts/uninstall.sh similarity index 100% rename from apps/nezha-dash/2.3.0/scripts/uninstall.sh rename to apps/nezha-dash/2.4.0/scripts/uninstall.sh diff --git a/apps/nezha-dash/2.3.0/scripts/upgrade.sh b/apps/nezha-dash/2.4.0/scripts/upgrade.sh similarity index 100% rename from apps/nezha-dash/2.3.0/scripts/upgrade.sh rename to apps/nezha-dash/2.4.0/scripts/upgrade.sh From 88b6f23723136646db25f1aac0f014d1f656a0db Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 24 Jan 2025 03:20:40 +0000 Subject: [PATCH 26/29] Processed apps directory via GitHub Actions --- appstore/rsshub/{2025-01-22 => 2025-01-23}/.env | 0 appstore/rsshub/{2025-01-22 => 2025-01-23}/data.yml | 0 appstore/rsshub/{2025-01-22 => 2025-01-23}/docker-compose.yml | 2 +- appstore/rsshub/{2025-01-22 => 2025-01-23}/envs/default.env | 0 appstore/rsshub/{2025-01-22 => 2025-01-23}/envs/global.env | 0 appstore/rsshub/{2025-01-22 => 2025-01-23}/scripts/init.sh | 0 appstore/rsshub/{2025-01-22 => 2025-01-23}/scripts/uninstall.sh | 0 appstore/rsshub/{2025-01-22 => 2025-01-23}/scripts/upgrade.sh | 0 dockge/rsshub/docker-compose.yml | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/.env (100%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/data.yml (100%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/docker-compose.yml (97%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/envs/default.env (100%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/envs/global.env (100%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/scripts/init.sh (100%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/scripts/uninstall.sh (100%) rename appstore/rsshub/{2025-01-22 => 2025-01-23}/scripts/upgrade.sh (100%) diff --git a/appstore/rsshub/2025-01-22/.env b/appstore/rsshub/2025-01-23/.env similarity index 100% rename from appstore/rsshub/2025-01-22/.env rename to appstore/rsshub/2025-01-23/.env diff --git a/appstore/rsshub/2025-01-22/data.yml b/appstore/rsshub/2025-01-23/data.yml similarity index 100% rename from appstore/rsshub/2025-01-22/data.yml rename to appstore/rsshub/2025-01-23/data.yml diff --git a/appstore/rsshub/2025-01-22/docker-compose.yml b/appstore/rsshub/2025-01-23/docker-compose.yml similarity index 97% rename from appstore/rsshub/2025-01-22/docker-compose.yml rename to appstore/rsshub/2025-01-23/docker-compose.yml index 18521502..1d5cf932 100644 --- a/appstore/rsshub/2025-01-22/docker-compose.yml +++ b/appstore/rsshub/2025-01-23/docker-compose.yml @@ -57,7 +57,7 @@ services: - -f - http://localhost:1200/healthz?key=${ACCESS_KEY} timeout: 10s - image: diygod/rsshub:2025-01-22 + image: diygod/rsshub:2025-01-23 labels: createdBy: Apps networks: diff --git a/appstore/rsshub/2025-01-22/envs/default.env b/appstore/rsshub/2025-01-23/envs/default.env similarity index 100% rename from appstore/rsshub/2025-01-22/envs/default.env rename to appstore/rsshub/2025-01-23/envs/default.env diff --git a/appstore/rsshub/2025-01-22/envs/global.env b/appstore/rsshub/2025-01-23/envs/global.env similarity index 100% rename from appstore/rsshub/2025-01-22/envs/global.env rename to appstore/rsshub/2025-01-23/envs/global.env diff --git a/appstore/rsshub/2025-01-22/scripts/init.sh b/appstore/rsshub/2025-01-23/scripts/init.sh similarity index 100% rename from appstore/rsshub/2025-01-22/scripts/init.sh rename to appstore/rsshub/2025-01-23/scripts/init.sh diff --git a/appstore/rsshub/2025-01-22/scripts/uninstall.sh b/appstore/rsshub/2025-01-23/scripts/uninstall.sh similarity index 100% rename from appstore/rsshub/2025-01-22/scripts/uninstall.sh rename to appstore/rsshub/2025-01-23/scripts/uninstall.sh diff --git a/appstore/rsshub/2025-01-22/scripts/upgrade.sh b/appstore/rsshub/2025-01-23/scripts/upgrade.sh similarity index 100% rename from appstore/rsshub/2025-01-22/scripts/upgrade.sh rename to appstore/rsshub/2025-01-23/scripts/upgrade.sh diff --git a/dockge/rsshub/docker-compose.yml b/dockge/rsshub/docker-compose.yml index 18521502..1d5cf932 100644 --- a/dockge/rsshub/docker-compose.yml +++ b/dockge/rsshub/docker-compose.yml @@ -57,7 +57,7 @@ services: - -f - http://localhost:1200/healthz?key=${ACCESS_KEY} timeout: 10s - image: diygod/rsshub:2025-01-22 + image: diygod/rsshub:2025-01-23 labels: createdBy: Apps networks: From 3bdf779db68e857ac7fe1f2800f118fe6e7fc8d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 03:28:35 +0000 Subject: [PATCH 27/29] Update ghcr.io/immich-app/immich-machine-learning Docker tag to v1.125.1 --- apps/immich-machine-learning/1.124.2/docker-compose.yml | 2 +- apps/immich/1.124.2/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/immich-machine-learning/1.124.2/docker-compose.yml b/apps/immich-machine-learning/1.124.2/docker-compose.yml index 5a68e8ac..64bfcc9d 100644 --- a/apps/immich-machine-learning/1.124.2/docker-compose.yml +++ b/apps/immich-machine-learning/1.124.2/docker-compose.yml @@ -6,7 +6,7 @@ name: immich-machine-learning services: immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v1.124.2 + image: ghcr.io/immich-app/immich-machine-learning:v1.125.1 container_name: immich-machine-learning-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich/1.124.2/docker-compose.yml b/apps/immich/1.124.2/docker-compose.yml index 0f260218..2677aabe 100644 --- a/apps/immich/1.124.2/docker-compose.yml +++ b/apps/immich/1.124.2/docker-compose.yml @@ -73,7 +73,7 @@ services: - /etc/localtime:/etc/localtime immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v1.124.2 + image: ghcr.io/immich-app/immich-machine-learning:v1.125.1 container_name: immich-machine-learning-${CONTAINER_NAME} labels: createdBy: "Apps" From 4b978d2a421f73784d7609e03ede8420e213d8b5 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 24 Jan 2025 03:28:49 +0000 Subject: [PATCH 28/29] Update app version [skip ci] --- apps/immich-machine-learning/{1.124.2 => 1.125.1}/data.yml | 0 .../{1.124.2 => 1.125.1}/docker-compose.yml | 0 .../immich-machine-learning/{1.124.2 => 1.125.1}/envs/default.env | 0 apps/immich-machine-learning/{1.124.2 => 1.125.1}/envs/global.env | 0 apps/immich-machine-learning/{1.124.2 => 1.125.1}/scripts/init.sh | 0 .../{1.124.2 => 1.125.1}/scripts/uninstall.sh | 0 .../{1.124.2 => 1.125.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/data.yml (100%) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/docker-compose.yml (100%) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/envs/default.env (100%) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/envs/global.env (100%) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/scripts/init.sh (100%) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/scripts/uninstall.sh (100%) rename apps/immich-machine-learning/{1.124.2 => 1.125.1}/scripts/upgrade.sh (100%) diff --git a/apps/immich-machine-learning/1.124.2/data.yml b/apps/immich-machine-learning/1.125.1/data.yml similarity index 100% rename from apps/immich-machine-learning/1.124.2/data.yml rename to apps/immich-machine-learning/1.125.1/data.yml diff --git a/apps/immich-machine-learning/1.124.2/docker-compose.yml b/apps/immich-machine-learning/1.125.1/docker-compose.yml similarity index 100% rename from apps/immich-machine-learning/1.124.2/docker-compose.yml rename to apps/immich-machine-learning/1.125.1/docker-compose.yml diff --git a/apps/immich-machine-learning/1.124.2/envs/default.env b/apps/immich-machine-learning/1.125.1/envs/default.env similarity index 100% rename from apps/immich-machine-learning/1.124.2/envs/default.env rename to apps/immich-machine-learning/1.125.1/envs/default.env diff --git a/apps/immich-machine-learning/1.124.2/envs/global.env b/apps/immich-machine-learning/1.125.1/envs/global.env similarity index 100% rename from apps/immich-machine-learning/1.124.2/envs/global.env rename to apps/immich-machine-learning/1.125.1/envs/global.env diff --git a/apps/immich-machine-learning/1.124.2/scripts/init.sh b/apps/immich-machine-learning/1.125.1/scripts/init.sh similarity index 100% rename from apps/immich-machine-learning/1.124.2/scripts/init.sh rename to apps/immich-machine-learning/1.125.1/scripts/init.sh diff --git a/apps/immich-machine-learning/1.124.2/scripts/uninstall.sh b/apps/immich-machine-learning/1.125.1/scripts/uninstall.sh similarity index 100% rename from apps/immich-machine-learning/1.124.2/scripts/uninstall.sh rename to apps/immich-machine-learning/1.125.1/scripts/uninstall.sh diff --git a/apps/immich-machine-learning/1.124.2/scripts/upgrade.sh b/apps/immich-machine-learning/1.125.1/scripts/upgrade.sh similarity index 100% rename from apps/immich-machine-learning/1.124.2/scripts/upgrade.sh rename to apps/immich-machine-learning/1.125.1/scripts/upgrade.sh From 1b7ba17be9c0249cca46773813dd152ebfc288f0 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Fri, 24 Jan 2025 03:28:49 +0000 Subject: [PATCH 29/29] Update app version [skip ci] --- apps/immich/{1.124.2 => 1.125.1}/data.yml | 0 apps/immich/{1.124.2 => 1.125.1}/docker-compose.yml | 0 apps/immich/{1.124.2 => 1.125.1}/envs/default.env | 0 apps/immich/{1.124.2 => 1.125.1}/envs/global.env | 0 apps/immich/{1.124.2 => 1.125.1}/scripts/init.sh | 0 apps/immich/{1.124.2 => 1.125.1}/scripts/uninstall.sh | 0 apps/immich/{1.124.2 => 1.125.1}/scripts/upgrade.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename apps/immich/{1.124.2 => 1.125.1}/data.yml (100%) rename apps/immich/{1.124.2 => 1.125.1}/docker-compose.yml (100%) rename apps/immich/{1.124.2 => 1.125.1}/envs/default.env (100%) rename apps/immich/{1.124.2 => 1.125.1}/envs/global.env (100%) rename apps/immich/{1.124.2 => 1.125.1}/scripts/init.sh (100%) rename apps/immich/{1.124.2 => 1.125.1}/scripts/uninstall.sh (100%) rename apps/immich/{1.124.2 => 1.125.1}/scripts/upgrade.sh (100%) diff --git a/apps/immich/1.124.2/data.yml b/apps/immich/1.125.1/data.yml similarity index 100% rename from apps/immich/1.124.2/data.yml rename to apps/immich/1.125.1/data.yml diff --git a/apps/immich/1.124.2/docker-compose.yml b/apps/immich/1.125.1/docker-compose.yml similarity index 100% rename from apps/immich/1.124.2/docker-compose.yml rename to apps/immich/1.125.1/docker-compose.yml diff --git a/apps/immich/1.124.2/envs/default.env b/apps/immich/1.125.1/envs/default.env similarity index 100% rename from apps/immich/1.124.2/envs/default.env rename to apps/immich/1.125.1/envs/default.env diff --git a/apps/immich/1.124.2/envs/global.env b/apps/immich/1.125.1/envs/global.env similarity index 100% rename from apps/immich/1.124.2/envs/global.env rename to apps/immich/1.125.1/envs/global.env diff --git a/apps/immich/1.124.2/scripts/init.sh b/apps/immich/1.125.1/scripts/init.sh similarity index 100% rename from apps/immich/1.124.2/scripts/init.sh rename to apps/immich/1.125.1/scripts/init.sh diff --git a/apps/immich/1.124.2/scripts/uninstall.sh b/apps/immich/1.125.1/scripts/uninstall.sh similarity index 100% rename from apps/immich/1.124.2/scripts/uninstall.sh rename to apps/immich/1.125.1/scripts/uninstall.sh diff --git a/apps/immich/1.124.2/scripts/upgrade.sh b/apps/immich/1.125.1/scripts/upgrade.sh similarity index 100% rename from apps/immich/1.124.2/scripts/upgrade.sh rename to apps/immich/1.125.1/scripts/upgrade.sh