From e127cc52bcddb037736603bab023be6c11009860 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Thu, 21 Aug 2025 12:44:28 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- .../2.7.3/2.7.2/envs/movie-pilot.env | 63 ---------- .../movie-pilot/{2.7.3/2.7.2 => 2.7.4}/.env | 33 ++++- .../{2.7.3/2.7.2 => 2.7.4}/data.yml | 118 +++++++++++++++--- .../movie-pilot/2.7.4}/docker-compose.yml | 32 ++--- .../{2.7.3/2.7.2 => 2.7.4}/envs/default.env | 0 .../{2.7.3/2.7.2 => 2.7.4}/envs/global.env | 0 .../{2.7.3/2.7.2 => 2.7.4}/scripts/init.sh | 0 .../2.7.2 => 2.7.4}/scripts/uninstall.sh | 0 .../{2.7.3/2.7.2 => 2.7.4}/scripts/upgrade.sh | 0 appstore/nacos-derby/{3.0.2 => 3.0.3}/.env | 0 .../nacos-derby/{3.0.2 => 3.0.3}/data.yml | 0 .../{3.0.2 => 3.0.3}/docker-compose.yml | 2 +- .../{3.0.2 => 3.0.3}/envs/default.env | 0 .../{3.0.2 => 3.0.3}/envs/global.env | 0 .../{3.0.2 => 3.0.3}/init/mysql-schema.sql | 0 .../{3.0.2 => 3.0.3}/scripts/init.sh | 0 .../{3.0.2 => 3.0.3}/scripts/uninstall.sh | 0 .../{3.0.2 => 3.0.3}/scripts/upgrade.sh | 0 appstore/nacos/{3.0.2 => 3.0.3}/.env | 0 appstore/nacos/{3.0.2 => 3.0.3}/data.yml | 0 .../nacos/{3.0.2 => 3.0.3}/docker-compose.yml | 2 +- .../nacos/{3.0.2 => 3.0.3}/envs/default.env | 0 .../nacos/{3.0.2 => 3.0.3}/envs/global.env | 0 .../{3.0.2 => 3.0.3}/init/mysql-schema.sql | 0 .../nacos/{3.0.2 => 3.0.3}/scripts/init.sh | 0 .../{3.0.2 => 3.0.3}/scripts/uninstall.sh | 0 .../nacos/{3.0.2 => 3.0.3}/scripts/upgrade.sh | 0 appstore/onedev/{12.0.4 => 12.0.5}/.env | 0 appstore/onedev/{12.0.4 => 12.0.5}/data.yml | 0 .../{12.0.4 => 12.0.5}/docker-compose.yml | 2 +- .../{12.0.4 => 12.0.5}/envs/default.env | 0 .../onedev/{12.0.4 => 12.0.5}/envs/global.env | 0 .../onedev/{12.0.4 => 12.0.5}/envs/onedev.env | 0 .../onedev/{12.0.4 => 12.0.5}/scripts/init.sh | 0 .../{12.0.4 => 12.0.5}/scripts/uninstall.sh | 0 .../{12.0.4 => 12.0.5}/scripts/upgrade.sh | 0 dockge/2.7.3/envs/movie-pilot.env | 63 ---------- dockge/movie-pilot/2.7.2/docker-compose.yml | 46 ------- dockge/movie-pilot/2.7.2/envs/movie-pilot.env | 63 ---------- dockge/{2.7.3 => movie-pilot_2_7_4}/.env | 33 ++++- .../movie-pilot_2_7_4}/docker-compose.yml | 32 ++--- .../envs/default.env | 0 .../envs/global.env | 0 dockge/nacos-derby/docker-compose.yml | 2 +- dockge/nacos_3_0_2/envs/default.env | 2 - dockge/nacos_3_0_2/envs/global.env | 2 - dockge/{nacos_3_0_2 => nacos_3_0_3}/.env | 0 .../docker-compose.yml | 2 +- .../2.7.2 => nacos_3_0_3}/envs/default.env | 0 .../2.7.2 => nacos_3_0_3}/envs/global.env | 0 .../init/mysql-schema.sql | 0 dockge/onedev/docker-compose.yml | 2 +- 52 files changed, 192 insertions(+), 307 deletions(-) delete mode 100644 appstore/movie-pilot/2.7.3/2.7.2/envs/movie-pilot.env rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/.env (54%) rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/data.yml (51%) rename {dockge/2.7.3 => appstore/movie-pilot/2.7.4}/docker-compose.yml (50%) rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/envs/default.env (100%) rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/envs/global.env (100%) rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/scripts/init.sh (100%) rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/scripts/uninstall.sh (100%) rename appstore/movie-pilot/{2.7.3/2.7.2 => 2.7.4}/scripts/upgrade.sh (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/.env (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/data.yml (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/docker-compose.yml (94%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/envs/default.env (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/envs/global.env (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/init/mysql-schema.sql (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/scripts/init.sh (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/scripts/uninstall.sh (100%) rename appstore/nacos-derby/{3.0.2 => 3.0.3}/scripts/upgrade.sh (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/.env (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/data.yml (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/docker-compose.yml (95%) rename appstore/nacos/{3.0.2 => 3.0.3}/envs/default.env (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/envs/global.env (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/init/mysql-schema.sql (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/scripts/init.sh (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/scripts/uninstall.sh (100%) rename appstore/nacos/{3.0.2 => 3.0.3}/scripts/upgrade.sh (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/.env (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/data.yml (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/docker-compose.yml (95%) rename appstore/onedev/{12.0.4 => 12.0.5}/envs/default.env (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/envs/global.env (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/envs/onedev.env (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/scripts/init.sh (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/scripts/uninstall.sh (100%) rename appstore/onedev/{12.0.4 => 12.0.5}/scripts/upgrade.sh (100%) delete mode 100644 dockge/2.7.3/envs/movie-pilot.env delete mode 100644 dockge/movie-pilot/2.7.2/docker-compose.yml delete mode 100644 dockge/movie-pilot/2.7.2/envs/movie-pilot.env rename dockge/{2.7.3 => movie-pilot_2_7_4}/.env (54%) rename {appstore/movie-pilot/2.7.3/2.7.2 => dockge/movie-pilot_2_7_4}/docker-compose.yml (50%) rename dockge/{2.7.3 => movie-pilot_2_7_4}/envs/default.env (100%) rename dockge/{2.7.3 => movie-pilot_2_7_4}/envs/global.env (100%) delete mode 100644 dockge/nacos_3_0_2/envs/default.env delete mode 100644 dockge/nacos_3_0_2/envs/global.env rename dockge/{nacos_3_0_2 => nacos_3_0_3}/.env (100%) rename dockge/{nacos_3_0_2 => nacos_3_0_3}/docker-compose.yml (95%) rename dockge/{movie-pilot/2.7.2 => nacos_3_0_3}/envs/default.env (100%) rename dockge/{movie-pilot/2.7.2 => nacos_3_0_3}/envs/global.env (100%) rename dockge/{nacos_3_0_2 => nacos_3_0_3}/init/mysql-schema.sql (100%) diff --git a/appstore/movie-pilot/2.7.3/2.7.2/envs/movie-pilot.env b/appstore/movie-pilot/2.7.3/2.7.2/envs/movie-pilot.env deleted file mode 100644 index 78ba50bf1..000000000 --- a/appstore/movie-pilot/2.7.3/2.7.2/envs/movie-pilot.env +++ /dev/null @@ -1,63 +0,0 @@ -####################################################################### -# 【*】为必配项，其余为选配项，选配项可以删除整项配置项或者保留配置默认值 # -####################################################################### -# 【*】API监听地址（注意不是前端访问地址） -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 -WALLPAPER=tmdb -# TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` -TMDB_IMAGE_DOMAIN=image.tmdb.org -# TMDB API地址，无需修改需保留默认值，也可配置为`api.tmdb.org`或其它中转代理服务地址，能连通即可 -TMDB_API_DOMAIN=api.themoviedb.org -# 媒体识别来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时不支持二级分类 -RECOGNIZE_SOURCE=themoviedb -# Fanart开关 -FANART_ENABLE=true -# 新增已入库媒体是否跟随TMDB信息变化，true/false，为false时即使TMDB信息变化时也会仍然按历史记录中已入库的信息进行刮削 -SCRAP_FOLLOW_TMDB=true -# 刮削来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时会缺失部分信息 -SCRAP_SOURCE=themoviedb -# 电影重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ -MOVIE_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/{{title}}{% if year %} ({{year}}){% endif %}{% if part %}-{{part}}{% endif %}{% if videoFormat %} - {{videoFormat}}{% endif %}{{fileExt}} -# 电视剧重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ -TV_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/Season {{season}}/{{title}} - {{season_episode}}{% if part %}-{{part}}{% endif %}{% if episode %} - 第 {{episode}} 集{% endif %}{{fileExt}} -# 交互搜索自动下载用户ID（消息通知渠道的用户ID），使用,分割，设置为 all 代表所有用户自动择优下载，未设置需要用户手动选择资源或者回复`0`才自动择优下载 -AUTO_DOWNLOAD_USER= -# 自动下载站点字幕（如有） -DOWNLOAD_SUBTITLE=true -# OCR服务器地址 -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 diff --git a/appstore/movie-pilot/2.7.3/2.7.2/.env b/appstore/movie-pilot/2.7.4/.env similarity index 54% rename from appstore/movie-pilot/2.7.3/2.7.2/.env rename to appstore/movie-pilot/2.7.4/.env index 394ed4126..7e3047285 100644 --- a/appstore/movie-pilot/2.7.3/2.7.2/.env +++ b/appstore/movie-pilot/2.7.4/.env @@ -1,3 +1,6 @@ +# 网络模式 [必填] +NETWORK_MODE=1panel-network + # 数据持久化路径 [必填] MOVIEPILOT_ROOT_PATH=/home/movie-pilot @@ -16,12 +19,12 @@ API_TOKEN=moviepilot # 网络代理 PROXY_HOST= -# 重启时自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false - # 自动更新资源包 [必填] AUTO_UPDATE_RESOURCE=false +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false + # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= @@ -34,3 +37,27 @@ CUSTOM_MOUNT_DIRECTORY_3= # IYUU登录令牌 IYUU_SIGN= +# 缓存类型 [必填] +CACHE_BACKEND_TYPE=cachetools + +# 缓存连接地址 +CACHE_BACKEND_URL= + +# 数据库类型 [必填] +DB_TYPE=sqlite + +# 数据库 主机地址 +DB_POSTGRESQL_HOST=127.0.0.1 + +# 数据库 端口 +DB_POSTGRESQL_PORT=5432 + +# 数据库 名称 +DB_POSTGRESQL_DATABASE=moviepilot + +# 数据库 用户名 +DB_POSTGRESQL_USERNAME=moviepilot + +# 数据库 密码 +DB_POSTGRESQL_PASSWORD= + diff --git a/appstore/movie-pilot/2.7.3/2.7.2/data.yml b/appstore/movie-pilot/2.7.4/data.yml similarity index 51% rename from appstore/movie-pilot/2.7.3/2.7.2/data.yml rename to appstore/movie-pilot/2.7.4/data.yml index ffeadb3d6..b5e05b838 100644 --- a/appstore/movie-pilot/2.7.3/2.7.2/data.yml +++ b/appstore/movie-pilot/2.7.4/data.yml @@ -1,5 +1,21 @@ additionalProperties: formFields: + - default: "1panel-network" + edit: true + envKey: NETWORK_MODE + labelZh: 网络模式 + labelEn: Network Mode + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" - default: "/home/movie-pilot" edit: true envKey: MOVIEPILOT_ROOT_PATH @@ -45,22 +61,6 @@ additionalProperties: required: false rule: paramExtUrl type: text - - default: "false" - edit: true - envKey: MOVIEPILOT_AUTO_UPDATE - labelZh: 重启时自动更新 - labelEn: Auto Update on Restart - required: true - type: select - values: - - label: 开启 - value: "true" - - label: 关闭 - value: "false" - - label: 发布版 - value: "release" - - label: 开发板 - value: "dev" - default: "false" edit: true envKey: AUTO_UPDATE_RESOURCE @@ -73,6 +73,22 @@ additionalProperties: value: "true" - label: 关闭 value: "false" + - default: "false" + edit: true + envKey: MOVIEPILOT_AUTO_UPDATE + labelZh: 自动更新 + labelEn: Auto Update + required: true + type: select + values: + - label: 开启 + value: "true" + - label: 发布版 + value: "release" + - label: 测试版 + value: "dev" + - label: 关闭 + value: "false" - default: "" edit: true envKey: CUSTOM_MOUNT_DIRECTORY_1 @@ -101,3 +117,73 @@ additionalProperties: labelZh: IYUU登录令牌 required: false type: password + - default: "cachetools" + edit: true + envKey: CACHE_BACKEND_TYPE + labelZh: 缓存类型 + labelEn: Cache Backend Type + required: true + type: select + values: + - label: 本地缓存 + value: "cachetools" + - label: Redis + value: "redis" + - default: "" + edit: true + envKey: CACHE_BACKEND_URL + labelZh: 缓存连接地址 + labelEn: Cache Backend URL + required: false + type: text + - default: "sqlite" + edit: true + envKey: DB_TYPE + labelZh: 数据库类型 + labelEn: DataBase Type + required: true + type: select + values: + - label: SQLite + value: "sqlite" + - label: PostgreSQL + value: "postgresql" + - default: "127.0.0.1" + edit: true + envKey: DB_POSTGRESQL_HOST + labelZh: 数据库 主机地址 + labelEn: Database Host + required: false + type: text + - default: 5432 + edit: true + envKey: DB_POSTGRESQL_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: false + rule: paramPort + type: number + - default: "moviepilot" + edit: true + envKey: DB_POSTGRESQL_DATABASE + labelZh: 数据库 名称 + labelEn: Database Name + required: false + rule: paramCommon + type: text + - default: "moviepilot" + edit: true + envKey: DB_POSTGRESQL_USERNAME + labelZh: 数据库 用户名 + labelEn: Database Username + required: false + type: text + - default: "" + edit: true + envKey: DB_POSTGRESQL_PASSWORD + labelZh: 数据库 密码 + labelEn: Database Password + random: true + required: false + rule: paramComplexity + type: password diff --git a/dockge/2.7.3/docker-compose.yml b/appstore/movie-pilot/2.7.4/docker-compose.yml similarity index 50% rename from dockge/2.7.3/docker-compose.yml rename to appstore/movie-pilot/2.7.4/docker-compose.yml index da77f1b93..6b1ecfca5 100644 --- a/dockge/2.7.3/docker-compose.yml +++ b/appstore/movie-pilot/2.7.4/docker-compose.yml @@ -2,44 +2,36 @@ networks: 1panel-network: external: true services: - movie-pilot-v2: - container_name: 2.7.3 + movie-pilot: + container_name: movie-pilot env_file: - ./envs/global.env - - ./envs/2.7.3.env - .env environment: - - NGINX_PORT=3000 - - PORT=3001 - - PUID=0 - - PGID=0 - - UMASK=022 - - TZ=Asia/Shanghai - - CACHE_BACKEND_TYPE=cachetools - - AUTH_SITE=iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi,sunny,ptcafe,ptzone,kufei,yemapt - - HTTP_PROXY=${PROXY_HOST} - - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.7.3 + - NGINX_PORT=${PANEL_APP_PORT_HTTP} + - PORT=${PANEL_APP_PORT_API} + - DEBUG=false + - DEV=false + - LOG_LEVEL=INFO + image: jxxghp/moviepilot:2.7.4 labels: createdBy: Apps logging: driver: json-file options: max-size: 5m - networks: - - 1panel-network + network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP}:3000 - - ${PANEL_APP_PORT_API}:3001 + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always stdin_open: true tty: true volumes: - /var/run/docker.sock:/var/run/docker.sock - ${MOVIEPILOT_ROOT_PATH}/config:/config - - ${MOVIEPILOT_ROOT_PATH}/ms-playwright:/moviepilot/.cache/ms-playwright + - ${MOVIEPILOT_ROOT_PATH}/moviepilot:/moviepilot - ${MOVIEPILOT_ROOT_PATH}/download:/download - - ${MOVIEPILOT_ROOT_PATH}/media:/media - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/appstore/movie-pilot/2.7.3/2.7.2/envs/default.env b/appstore/movie-pilot/2.7.4/envs/default.env similarity index 100% rename from appstore/movie-pilot/2.7.3/2.7.2/envs/default.env rename to appstore/movie-pilot/2.7.4/envs/default.env diff --git a/appstore/movie-pilot/2.7.3/2.7.2/envs/global.env b/appstore/movie-pilot/2.7.4/envs/global.env similarity index 100% rename from appstore/movie-pilot/2.7.3/2.7.2/envs/global.env rename to appstore/movie-pilot/2.7.4/envs/global.env diff --git a/appstore/movie-pilot/2.7.3/2.7.2/scripts/init.sh b/appstore/movie-pilot/2.7.4/scripts/init.sh similarity index 100% rename from appstore/movie-pilot/2.7.3/2.7.2/scripts/init.sh rename to appstore/movie-pilot/2.7.4/scripts/init.sh diff --git a/appstore/movie-pilot/2.7.3/2.7.2/scripts/uninstall.sh b/appstore/movie-pilot/2.7.4/scripts/uninstall.sh similarity index 100% rename from appstore/movie-pilot/2.7.3/2.7.2/scripts/uninstall.sh rename to appstore/movie-pilot/2.7.4/scripts/uninstall.sh diff --git a/appstore/movie-pilot/2.7.3/2.7.2/scripts/upgrade.sh b/appstore/movie-pilot/2.7.4/scripts/upgrade.sh similarity index 100% rename from appstore/movie-pilot/2.7.3/2.7.2/scripts/upgrade.sh rename to appstore/movie-pilot/2.7.4/scripts/upgrade.sh diff --git a/appstore/nacos-derby/3.0.2/.env b/appstore/nacos-derby/3.0.3/.env similarity index 100% rename from appstore/nacos-derby/3.0.2/.env rename to appstore/nacos-derby/3.0.3/.env diff --git a/appstore/nacos-derby/3.0.2/data.yml b/appstore/nacos-derby/3.0.3/data.yml similarity index 100% rename from appstore/nacos-derby/3.0.2/data.yml rename to appstore/nacos-derby/3.0.3/data.yml diff --git a/appstore/nacos-derby/3.0.2/docker-compose.yml b/appstore/nacos-derby/3.0.3/docker-compose.yml similarity index 94% rename from appstore/nacos-derby/3.0.2/docker-compose.yml rename to appstore/nacos-derby/3.0.3/docker-compose.yml index b4360ceb1..4339c4011 100644 --- a/appstore/nacos-derby/3.0.2/docker-compose.yml +++ b/appstore/nacos-derby/3.0.3/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - image: nacos/nacos-server:v3.0.2 + image: nacos/nacos-server:v3.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/nacos-derby/3.0.2/envs/default.env b/appstore/nacos-derby/3.0.3/envs/default.env similarity index 100% rename from appstore/nacos-derby/3.0.2/envs/default.env rename to appstore/nacos-derby/3.0.3/envs/default.env diff --git a/appstore/nacos-derby/3.0.2/envs/global.env b/appstore/nacos-derby/3.0.3/envs/global.env similarity index 100% rename from appstore/nacos-derby/3.0.2/envs/global.env rename to appstore/nacos-derby/3.0.3/envs/global.env diff --git a/appstore/nacos-derby/3.0.2/init/mysql-schema.sql b/appstore/nacos-derby/3.0.3/init/mysql-schema.sql similarity index 100% rename from appstore/nacos-derby/3.0.2/init/mysql-schema.sql rename to appstore/nacos-derby/3.0.3/init/mysql-schema.sql diff --git a/appstore/nacos-derby/3.0.2/scripts/init.sh b/appstore/nacos-derby/3.0.3/scripts/init.sh similarity index 100% rename from appstore/nacos-derby/3.0.2/scripts/init.sh rename to appstore/nacos-derby/3.0.3/scripts/init.sh diff --git a/appstore/nacos-derby/3.0.2/scripts/uninstall.sh b/appstore/nacos-derby/3.0.3/scripts/uninstall.sh similarity index 100% rename from appstore/nacos-derby/3.0.2/scripts/uninstall.sh rename to appstore/nacos-derby/3.0.3/scripts/uninstall.sh diff --git a/appstore/nacos-derby/3.0.2/scripts/upgrade.sh b/appstore/nacos-derby/3.0.3/scripts/upgrade.sh similarity index 100% rename from appstore/nacos-derby/3.0.2/scripts/upgrade.sh rename to appstore/nacos-derby/3.0.3/scripts/upgrade.sh diff --git a/appstore/nacos/3.0.2/.env b/appstore/nacos/3.0.3/.env similarity index 100% rename from appstore/nacos/3.0.2/.env rename to appstore/nacos/3.0.3/.env diff --git a/appstore/nacos/3.0.2/data.yml b/appstore/nacos/3.0.3/data.yml similarity index 100% rename from appstore/nacos/3.0.2/data.yml rename to appstore/nacos/3.0.3/data.yml diff --git a/appstore/nacos/3.0.2/docker-compose.yml b/appstore/nacos/3.0.3/docker-compose.yml similarity index 95% rename from appstore/nacos/3.0.2/docker-compose.yml rename to appstore/nacos/3.0.3/docker-compose.yml index 76ef8b9fd..fab0783b0 100644 --- a/appstore/nacos/3.0.2/docker-compose.yml +++ b/appstore/nacos/3.0.3/docker-compose.yml @@ -13,7 +13,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.0.2 + image: nacos/nacos-server:v3.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/nacos/3.0.2/envs/default.env b/appstore/nacos/3.0.3/envs/default.env similarity index 100% rename from appstore/nacos/3.0.2/envs/default.env rename to appstore/nacos/3.0.3/envs/default.env diff --git a/appstore/nacos/3.0.2/envs/global.env b/appstore/nacos/3.0.3/envs/global.env similarity index 100% rename from appstore/nacos/3.0.2/envs/global.env rename to appstore/nacos/3.0.3/envs/global.env diff --git a/appstore/nacos/3.0.2/init/mysql-schema.sql b/appstore/nacos/3.0.3/init/mysql-schema.sql similarity index 100% rename from appstore/nacos/3.0.2/init/mysql-schema.sql rename to appstore/nacos/3.0.3/init/mysql-schema.sql diff --git a/appstore/nacos/3.0.2/scripts/init.sh b/appstore/nacos/3.0.3/scripts/init.sh similarity index 100% rename from appstore/nacos/3.0.2/scripts/init.sh rename to appstore/nacos/3.0.3/scripts/init.sh diff --git a/appstore/nacos/3.0.2/scripts/uninstall.sh b/appstore/nacos/3.0.3/scripts/uninstall.sh similarity index 100% rename from appstore/nacos/3.0.2/scripts/uninstall.sh rename to appstore/nacos/3.0.3/scripts/uninstall.sh diff --git a/appstore/nacos/3.0.2/scripts/upgrade.sh b/appstore/nacos/3.0.3/scripts/upgrade.sh similarity index 100% rename from appstore/nacos/3.0.2/scripts/upgrade.sh rename to appstore/nacos/3.0.3/scripts/upgrade.sh diff --git a/appstore/onedev/12.0.4/.env b/appstore/onedev/12.0.5/.env similarity index 100% rename from appstore/onedev/12.0.4/.env rename to appstore/onedev/12.0.5/.env diff --git a/appstore/onedev/12.0.4/data.yml b/appstore/onedev/12.0.5/data.yml similarity index 100% rename from appstore/onedev/12.0.4/data.yml rename to appstore/onedev/12.0.5/data.yml diff --git a/appstore/onedev/12.0.4/docker-compose.yml b/appstore/onedev/12.0.5/docker-compose.yml similarity index 95% rename from appstore/onedev/12.0.4/docker-compose.yml rename to appstore/onedev/12.0.5/docker-compose.yml index f8e62ac8b..50a834ccc 100644 --- a/appstore/onedev/12.0.4/docker-compose.yml +++ b/appstore/onedev/12.0.5/docker-compose.yml @@ -14,7 +14,7 @@ services: - initial_email=${INITIAL_EMAIL} - initial_server_url=${INITIAL_SERVER_URL} - initial_ssh_root_url=${INITIAL_SSH_ROOT_URL} - image: 1dev/server:12.0.4 + image: 1dev/server:12.0.5 labels: createdBy: Apps networks: diff --git a/appstore/onedev/12.0.4/envs/default.env b/appstore/onedev/12.0.5/envs/default.env similarity index 100% rename from appstore/onedev/12.0.4/envs/default.env rename to appstore/onedev/12.0.5/envs/default.env diff --git a/appstore/onedev/12.0.4/envs/global.env b/appstore/onedev/12.0.5/envs/global.env similarity index 100% rename from appstore/onedev/12.0.4/envs/global.env rename to appstore/onedev/12.0.5/envs/global.env diff --git a/appstore/onedev/12.0.4/envs/onedev.env b/appstore/onedev/12.0.5/envs/onedev.env similarity index 100% rename from appstore/onedev/12.0.4/envs/onedev.env rename to appstore/onedev/12.0.5/envs/onedev.env diff --git a/appstore/onedev/12.0.4/scripts/init.sh b/appstore/onedev/12.0.5/scripts/init.sh similarity index 100% rename from appstore/onedev/12.0.4/scripts/init.sh rename to appstore/onedev/12.0.5/scripts/init.sh diff --git a/appstore/onedev/12.0.4/scripts/uninstall.sh b/appstore/onedev/12.0.5/scripts/uninstall.sh similarity index 100% rename from appstore/onedev/12.0.4/scripts/uninstall.sh rename to appstore/onedev/12.0.5/scripts/uninstall.sh diff --git a/appstore/onedev/12.0.4/scripts/upgrade.sh b/appstore/onedev/12.0.5/scripts/upgrade.sh similarity index 100% rename from appstore/onedev/12.0.4/scripts/upgrade.sh rename to appstore/onedev/12.0.5/scripts/upgrade.sh diff --git a/dockge/2.7.3/envs/movie-pilot.env b/dockge/2.7.3/envs/movie-pilot.env deleted file mode 100644 index 78ba50bf1..000000000 --- a/dockge/2.7.3/envs/movie-pilot.env +++ /dev/null @@ -1,63 +0,0 @@ -####################################################################### -# 【*】为必配项，其余为选配项，选配项可以删除整项配置项或者保留配置默认值 # -####################################################################### -# 【*】API监听地址（注意不是前端访问地址） -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 -WALLPAPER=tmdb -# TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` -TMDB_IMAGE_DOMAIN=image.tmdb.org -# TMDB API地址，无需修改需保留默认值，也可配置为`api.tmdb.org`或其它中转代理服务地址，能连通即可 -TMDB_API_DOMAIN=api.themoviedb.org -# 媒体识别来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时不支持二级分类 -RECOGNIZE_SOURCE=themoviedb -# Fanart开关 -FANART_ENABLE=true -# 新增已入库媒体是否跟随TMDB信息变化，true/false，为false时即使TMDB信息变化时也会仍然按历史记录中已入库的信息进行刮削 -SCRAP_FOLLOW_TMDB=true -# 刮削来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时会缺失部分信息 -SCRAP_SOURCE=themoviedb -# 电影重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ -MOVIE_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/{{title}}{% if year %} ({{year}}){% endif %}{% if part %}-{{part}}{% endif %}{% if videoFormat %} - {{videoFormat}}{% endif %}{{fileExt}} -# 电视剧重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ -TV_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/Season {{season}}/{{title}} - {{season_episode}}{% if part %}-{{part}}{% endif %}{% if episode %} - 第 {{episode}} 集{% endif %}{{fileExt}} -# 交互搜索自动下载用户ID（消息通知渠道的用户ID），使用,分割，设置为 all 代表所有用户自动择优下载，未设置需要用户手动选择资源或者回复`0`才自动择优下载 -AUTO_DOWNLOAD_USER= -# 自动下载站点字幕（如有） -DOWNLOAD_SUBTITLE=true -# OCR服务器地址 -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 diff --git a/dockge/movie-pilot/2.7.2/docker-compose.yml b/dockge/movie-pilot/2.7.2/docker-compose.yml deleted file mode 100644 index 64fb2d218..000000000 --- a/dockge/movie-pilot/2.7.2/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - movie-pilot-v2: - image: jxxghp/moviepilot-v2:2.7.3 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - stdin_open: true - tty: true - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:3000 - - ${PANEL_APP_PORT_API}:3001 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/movie-pilot/movie-pilot2.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ${MOVIEPILOT_ROOT_PATH}/config:/config - - ${MOVIEPILOT_ROOT_PATH}/ms-playwright:/moviepilot/.cache/ms-playwright - - ${MOVIEPILOT_ROOT_PATH}/download:/download - - ${MOVIEPILOT_ROOT_PATH}/media:/media - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} - environment: - - NGINX_PORT=3000 - - PORT=3001 - - PUID=0 - - PGID=0 - - UMASK=022 - - TZ=Asia/Shanghai - - CACHE_BACKEND_TYPE=cachetools - - AUTH_SITE=iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi,sunny,ptcafe,ptzone,kufei,yemapt - - HTTP_PROXY=${PROXY_HOST} - - HTTPS_PROXY=${PROXY_HOST} - logging: - driver: json-file - options: - max-size: 5m diff --git a/dockge/movie-pilot/2.7.2/envs/movie-pilot.env b/dockge/movie-pilot/2.7.2/envs/movie-pilot.env deleted file mode 100644 index 78ba50bf1..000000000 --- a/dockge/movie-pilot/2.7.2/envs/movie-pilot.env +++ /dev/null @@ -1,63 +0,0 @@ -####################################################################### -# 【*】为必配项，其余为选配项，选配项可以删除整项配置项或者保留配置默认值 # -####################################################################### -# 【*】API监听地址（注意不是前端访问地址） -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 -WALLPAPER=tmdb -# TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` -TMDB_IMAGE_DOMAIN=image.tmdb.org -# TMDB API地址，无需修改需保留默认值，也可配置为`api.tmdb.org`或其它中转代理服务地址，能连通即可 -TMDB_API_DOMAIN=api.themoviedb.org -# 媒体识别来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时不支持二级分类 -RECOGNIZE_SOURCE=themoviedb -# Fanart开关 -FANART_ENABLE=true -# 新增已入库媒体是否跟随TMDB信息变化，true/false，为false时即使TMDB信息变化时也会仍然按历史记录中已入库的信息进行刮削 -SCRAP_FOLLOW_TMDB=true -# 刮削来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时会缺失部分信息 -SCRAP_SOURCE=themoviedb -# 电影重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ -MOVIE_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/{{title}}{% if year %} ({{year}}){% endif %}{% if part %}-{{part}}{% endif %}{% if videoFormat %} - {{videoFormat}}{% endif %}{{fileExt}} -# 电视剧重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ -TV_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/Season {{season}}/{{title}} - {{season_episode}}{% if part %}-{{part}}{% endif %}{% if episode %} - 第 {{episode}} 集{% endif %}{{fileExt}} -# 交互搜索自动下载用户ID（消息通知渠道的用户ID），使用,分割，设置为 all 代表所有用户自动择优下载，未设置需要用户手动选择资源或者回复`0`才自动择优下载 -AUTO_DOWNLOAD_USER= -# 自动下载站点字幕（如有） -DOWNLOAD_SUBTITLE=true -# OCR服务器地址 -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 diff --git a/dockge/2.7.3/.env b/dockge/movie-pilot_2_7_4/.env similarity index 54% rename from dockge/2.7.3/.env rename to dockge/movie-pilot_2_7_4/.env index 394ed4126..7e3047285 100644 --- a/dockge/2.7.3/.env +++ b/dockge/movie-pilot_2_7_4/.env @@ -1,3 +1,6 @@ +# 网络模式 [必填] +NETWORK_MODE=1panel-network + # 数据持久化路径 [必填] MOVIEPILOT_ROOT_PATH=/home/movie-pilot @@ -16,12 +19,12 @@ API_TOKEN=moviepilot # 网络代理 PROXY_HOST= -# 重启时自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false - # 自动更新资源包 [必填] AUTO_UPDATE_RESOURCE=false +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false + # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= @@ -34,3 +37,27 @@ CUSTOM_MOUNT_DIRECTORY_3= # IYUU登录令牌 IYUU_SIGN= +# 缓存类型 [必填] +CACHE_BACKEND_TYPE=cachetools + +# 缓存连接地址 +CACHE_BACKEND_URL= + +# 数据库类型 [必填] +DB_TYPE=sqlite + +# 数据库 主机地址 +DB_POSTGRESQL_HOST=127.0.0.1 + +# 数据库 端口 +DB_POSTGRESQL_PORT=5432 + +# 数据库 名称 +DB_POSTGRESQL_DATABASE=moviepilot + +# 数据库 用户名 +DB_POSTGRESQL_USERNAME=moviepilot + +# 数据库 密码 +DB_POSTGRESQL_PASSWORD= + diff --git a/appstore/movie-pilot/2.7.3/2.7.2/docker-compose.yml b/dockge/movie-pilot_2_7_4/docker-compose.yml similarity index 50% rename from appstore/movie-pilot/2.7.3/2.7.2/docker-compose.yml rename to dockge/movie-pilot_2_7_4/docker-compose.yml index da77f1b93..6b1ecfca5 100644 --- a/appstore/movie-pilot/2.7.3/2.7.2/docker-compose.yml +++ b/dockge/movie-pilot_2_7_4/docker-compose.yml @@ -2,44 +2,36 @@ networks: 1panel-network: external: true services: - movie-pilot-v2: - container_name: 2.7.3 + movie-pilot: + container_name: movie-pilot env_file: - ./envs/global.env - - ./envs/2.7.3.env - .env environment: - - NGINX_PORT=3000 - - PORT=3001 - - PUID=0 - - PGID=0 - - UMASK=022 - - TZ=Asia/Shanghai - - CACHE_BACKEND_TYPE=cachetools - - AUTH_SITE=iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi,sunny,ptcafe,ptzone,kufei,yemapt - - HTTP_PROXY=${PROXY_HOST} - - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.7.3 + - NGINX_PORT=${PANEL_APP_PORT_HTTP} + - PORT=${PANEL_APP_PORT_API} + - DEBUG=false + - DEV=false + - LOG_LEVEL=INFO + image: jxxghp/moviepilot:2.7.4 labels: createdBy: Apps logging: driver: json-file options: max-size: 5m - networks: - - 1panel-network + network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP}:3000 - - ${PANEL_APP_PORT_API}:3001 + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always stdin_open: true tty: true volumes: - /var/run/docker.sock:/var/run/docker.sock - ${MOVIEPILOT_ROOT_PATH}/config:/config - - ${MOVIEPILOT_ROOT_PATH}/ms-playwright:/moviepilot/.cache/ms-playwright + - ${MOVIEPILOT_ROOT_PATH}/moviepilot:/moviepilot - ${MOVIEPILOT_ROOT_PATH}/download:/download - - ${MOVIEPILOT_ROOT_PATH}/media:/media - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} diff --git a/dockge/2.7.3/envs/default.env b/dockge/movie-pilot_2_7_4/envs/default.env similarity index 100% rename from dockge/2.7.3/envs/default.env rename to dockge/movie-pilot_2_7_4/envs/default.env diff --git a/dockge/2.7.3/envs/global.env b/dockge/movie-pilot_2_7_4/envs/global.env similarity index 100% rename from dockge/2.7.3/envs/global.env rename to dockge/movie-pilot_2_7_4/envs/global.env diff --git a/dockge/nacos-derby/docker-compose.yml b/dockge/nacos-derby/docker-compose.yml index b4360ceb1..4339c4011 100644 --- a/dockge/nacos-derby/docker-compose.yml +++ b/dockge/nacos-derby/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - image: nacos/nacos-server:v3.0.2 + image: nacos/nacos-server:v3.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_3_0_2/envs/default.env b/dockge/nacos_3_0_2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/nacos_3_0_2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/nacos_3_0_2/envs/global.env b/dockge/nacos_3_0_2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/nacos_3_0_2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/nacos_3_0_2/.env b/dockge/nacos_3_0_3/.env similarity index 100% rename from dockge/nacos_3_0_2/.env rename to dockge/nacos_3_0_3/.env diff --git a/dockge/nacos_3_0_2/docker-compose.yml b/dockge/nacos_3_0_3/docker-compose.yml similarity index 95% rename from dockge/nacos_3_0_2/docker-compose.yml rename to dockge/nacos_3_0_3/docker-compose.yml index 76ef8b9fd..fab0783b0 100644 --- a/dockge/nacos_3_0_2/docker-compose.yml +++ b/dockge/nacos_3_0_3/docker-compose.yml @@ -13,7 +13,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.0.2 + image: nacos/nacos-server:v3.0.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/movie-pilot/2.7.2/envs/default.env b/dockge/nacos_3_0_3/envs/default.env similarity index 100% rename from dockge/movie-pilot/2.7.2/envs/default.env rename to dockge/nacos_3_0_3/envs/default.env diff --git a/dockge/movie-pilot/2.7.2/envs/global.env b/dockge/nacos_3_0_3/envs/global.env similarity index 100% rename from dockge/movie-pilot/2.7.2/envs/global.env rename to dockge/nacos_3_0_3/envs/global.env diff --git a/dockge/nacos_3_0_2/init/mysql-schema.sql b/dockge/nacos_3_0_3/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_3_0_2/init/mysql-schema.sql rename to dockge/nacos_3_0_3/init/mysql-schema.sql diff --git a/dockge/onedev/docker-compose.yml b/dockge/onedev/docker-compose.yml index f8e62ac8b..50a834ccc 100644 --- a/dockge/onedev/docker-compose.yml +++ b/dockge/onedev/docker-compose.yml @@ -14,7 +14,7 @@ services: - initial_email=${INITIAL_EMAIL} - initial_server_url=${INITIAL_SERVER_URL} - initial_ssh_root_url=${INITIAL_SSH_ROOT_URL} - image: 1dev/server:12.0.4 + image: 1dev/server:12.0.5 labels: createdBy: Apps networks: