diff --git a/appstore/casdoor/1.792.0/.env b/appstore/casdoor/1.793.0/.env similarity index 100% rename from appstore/casdoor/1.792.0/.env rename to appstore/casdoor/1.793.0/.env diff --git a/appstore/casdoor/1.792.0/config/init_data.json b/appstore/casdoor/1.793.0/config/init_data.json similarity index 100% rename from appstore/casdoor/1.792.0/config/init_data.json rename to appstore/casdoor/1.793.0/config/init_data.json diff --git a/appstore/casdoor/1.792.0/data.yml b/appstore/casdoor/1.793.0/data.yml similarity index 100% rename from appstore/casdoor/1.792.0/data.yml rename to appstore/casdoor/1.793.0/data.yml diff --git a/appstore/casdoor/1.792.0/docker-compose.yml b/appstore/casdoor/1.793.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/1.792.0/docker-compose.yml rename to appstore/casdoor/1.793.0/docker-compose.yml index 0732d107..1cb607a9 100644 --- a/appstore/casdoor/1.792.0/docker-compose.yml +++ b/appstore/casdoor/1.793.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.792.0 + image: casbin/casdoor:v1.793.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/1.792.0/envs/casdoor.env b/appstore/casdoor/1.793.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/1.792.0/envs/casdoor.env rename to appstore/casdoor/1.793.0/envs/casdoor.env diff --git a/appstore/casdoor/1.792.0/envs/default.env b/appstore/casdoor/1.793.0/envs/default.env similarity index 100% rename from appstore/casdoor/1.792.0/envs/default.env rename to appstore/casdoor/1.793.0/envs/default.env diff --git a/appstore/casdoor/1.792.0/envs/global.env b/appstore/casdoor/1.793.0/envs/global.env similarity index 100% rename from appstore/casdoor/1.792.0/envs/global.env rename to appstore/casdoor/1.793.0/envs/global.env diff --git a/appstore/casdoor/1.792.0/scripts/init.sh b/appstore/casdoor/1.793.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/1.792.0/scripts/init.sh rename to appstore/casdoor/1.793.0/scripts/init.sh diff --git a/appstore/casdoor/1.792.0/scripts/uninstall.sh b/appstore/casdoor/1.793.0/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/1.792.0/scripts/uninstall.sh rename to appstore/casdoor/1.793.0/scripts/uninstall.sh diff --git a/appstore/casdoor/1.792.0/scripts/upgrade.sh b/appstore/casdoor/1.793.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/1.792.0/scripts/upgrade.sh rename to appstore/casdoor/1.793.0/scripts/upgrade.sh diff --git a/appstore/movie-pilot/2.1.8/.env b/appstore/movie-pilot/2.2.0/.env similarity index 100% rename from appstore/movie-pilot/2.1.8/.env rename to appstore/movie-pilot/2.2.0/.env diff --git a/appstore/movie-pilot/2.1.8/data.yml b/appstore/movie-pilot/2.2.0/data.yml similarity index 100% rename from appstore/movie-pilot/2.1.8/data.yml rename to appstore/movie-pilot/2.2.0/data.yml diff --git a/appstore/movie-pilot/2.1.8/docker-compose.yml b/appstore/movie-pilot/2.2.0/docker-compose.yml similarity index 96% rename from appstore/movie-pilot/2.1.8/docker-compose.yml rename to appstore/movie-pilot/2.2.0/docker-compose.yml index cfe4de52..ee76cd7a 100644 --- a/appstore/movie-pilot/2.1.8/docker-compose.yml +++ b/appstore/movie-pilot/2.2.0/docker-compose.yml @@ -16,7 +16,7 @@ services: - UMASK=022 - HTTP_PROXY=${PROXY_HOST} - HTTPS_PROXY=${PROXY_HOST} - image: jxxghp/moviepilot-v2:2.1.8 + image: jxxghp/moviepilot-v2:2.2.0 labels: createdBy: Apps logging: diff --git a/appstore/movie-pilot/2.1.8/envs/default.env b/appstore/movie-pilot/2.2.0/envs/default.env similarity index 100% rename from appstore/movie-pilot/2.1.8/envs/default.env rename to appstore/movie-pilot/2.2.0/envs/default.env diff --git a/appstore/movie-pilot/2.1.8/envs/global.env b/appstore/movie-pilot/2.2.0/envs/global.env similarity index 100% rename from appstore/movie-pilot/2.1.8/envs/global.env rename to appstore/movie-pilot/2.2.0/envs/global.env diff --git a/appstore/movie-pilot/2.1.8/envs/movie-pilot.env b/appstore/movie-pilot/2.2.0/envs/movie-pilot.env similarity index 100% rename from appstore/movie-pilot/2.1.8/envs/movie-pilot.env rename to appstore/movie-pilot/2.2.0/envs/movie-pilot.env diff --git a/appstore/movie-pilot/2.1.8/scripts/init.sh b/appstore/movie-pilot/2.2.0/scripts/init.sh similarity index 100% rename from appstore/movie-pilot/2.1.8/scripts/init.sh rename to appstore/movie-pilot/2.2.0/scripts/init.sh diff --git a/appstore/movie-pilot/2.1.8/scripts/uninstall.sh b/appstore/movie-pilot/2.2.0/scripts/uninstall.sh similarity index 100% rename from appstore/movie-pilot/2.1.8/scripts/uninstall.sh rename to appstore/movie-pilot/2.2.0/scripts/uninstall.sh diff --git a/appstore/movie-pilot/2.1.8/scripts/upgrade.sh b/appstore/movie-pilot/2.2.0/scripts/upgrade.sh similarity index 100% rename from appstore/movie-pilot/2.1.8/scripts/upgrade.sh rename to appstore/movie-pilot/2.2.0/scripts/upgrade.sh diff --git a/appstore/nocodb/0.260.0/.env b/appstore/nocodb/0.260.1/.env similarity index 100% rename from appstore/nocodb/0.260.0/.env rename to appstore/nocodb/0.260.1/.env diff --git a/appstore/nocodb/0.260.0/data.yml b/appstore/nocodb/0.260.1/data.yml similarity index 100% rename from appstore/nocodb/0.260.0/data.yml rename to appstore/nocodb/0.260.1/data.yml diff --git a/appstore/nocodb/0.260.0/docker-compose.yml b/appstore/nocodb/0.260.1/docker-compose.yml similarity index 95% rename from appstore/nocodb/0.260.0/docker-compose.yml rename to appstore/nocodb/0.260.1/docker-compose.yml index fffce417..859a3324 100644 --- a/appstore/nocodb/0.260.0/docker-compose.yml +++ b/appstore/nocodb/0.260.1/docker-compose.yml @@ -17,7 +17,7 @@ services: - NC_SMTP_SECURE=true - NC_SMTP_IGNORE_TLS=false - NC_DB=${DB_TYPE}://${DB_HOSTNAME}:${DB_PORT}?u=${DB_USER}&p=${DB_PASSWD}&d=${DB_NAME} - image: nocodb/nocodb:0.260.0 + image: nocodb/nocodb:0.260.1 labels: createdBy: Apps networks: diff --git a/appstore/nocodb/0.260.0/envs/default.env b/appstore/nocodb/0.260.1/envs/default.env similarity index 100% rename from appstore/nocodb/0.260.0/envs/default.env rename to appstore/nocodb/0.260.1/envs/default.env diff --git a/appstore/nocodb/0.260.0/envs/global.env b/appstore/nocodb/0.260.1/envs/global.env similarity index 100% rename from appstore/nocodb/0.260.0/envs/global.env rename to appstore/nocodb/0.260.1/envs/global.env diff --git a/appstore/nocodb/0.260.0/scripts/init.sh b/appstore/nocodb/0.260.1/scripts/init.sh similarity index 100% rename from appstore/nocodb/0.260.0/scripts/init.sh rename to appstore/nocodb/0.260.1/scripts/init.sh diff --git a/appstore/nocodb/0.260.0/scripts/uninstall.sh b/appstore/nocodb/0.260.1/scripts/uninstall.sh similarity index 100% rename from appstore/nocodb/0.260.0/scripts/uninstall.sh rename to appstore/nocodb/0.260.1/scripts/uninstall.sh diff --git a/appstore/nocodb/0.260.0/scripts/upgrade.sh b/appstore/nocodb/0.260.1/scripts/upgrade.sh similarity index 100% rename from appstore/nocodb/0.260.0/scripts/upgrade.sh rename to appstore/nocodb/0.260.1/scripts/upgrade.sh diff --git a/appstore/nodebb/3.12.2/conf/setup.json b/appstore/nodebb/3.12.2/conf/setup.json new file mode 100644 index 00000000..bc85928b --- /dev/null +++ b/appstore/nodebb/3.12.2/conf/setup.json @@ -0,0 +1,3 @@ +{ + "defaults": {} +} diff --git a/appstore/nodebb/3.12.2/docker-compose.yml b/appstore/nodebb/3.12.2/docker-compose.yml index 750460f3..cbc69642 100644 --- a/appstore/nodebb/3.12.2/docker-compose.yml +++ b/appstore/nodebb/3.12.2/docker-compose.yml @@ -20,6 +20,8 @@ services: - ${PANEL_APP_PORT_HTTP}:4567 restart: always volumes: + - ${NODEBB_ROOT_PATH}/node_modules:/usr/src/app/node_modules - ${NODEBB_ROOT_PATH}/build:/usr/src/app/build - ${NODEBB_ROOT_PATH}/uploads:/usr/src/app/public/uploads - ${NODEBB_ROOT_PATH}/config:/opt/config + - ${NODEBB_ROOT_PATH}/setup.json:/usr/src/app/setup.json diff --git a/appstore/nodebb/3.12.2/scripts/init.sh b/appstore/nodebb/3.12.2/scripts/init.sh index 388ae28f..62ec83c2 100644 --- a/appstore/nodebb/3.12.2/scripts/init.sh +++ b/appstore/nodebb/3.12.2/scripts/init.sh @@ -16,6 +16,8 @@ if [ -f .env ]; then mkdir -p "$NODEBB_ROOT_PATH/uploads" mkdir -p "$NODEBB_ROOT_PATH/config" + cp ./conf/setup.json "$NODEBB_ROOT_PATH/setup.json" + chown -R 1001:1001 "$NODEBB_ROOT_PATH" chown -R 1001:1001 "$NODEBB_ROOT_PATH/build" chown -R 1001:1001 "$NODEBB_ROOT_PATH/uploads" diff --git a/appstore/slink/1.4.5/.env b/appstore/slink/1.4.6/.env similarity index 100% rename from appstore/slink/1.4.5/.env rename to appstore/slink/1.4.6/.env diff --git a/appstore/slink/1.4.5/data.yml b/appstore/slink/1.4.6/data.yml similarity index 100% rename from appstore/slink/1.4.5/data.yml rename to appstore/slink/1.4.6/data.yml diff --git a/appstore/slink/1.4.5/docker-compose.yml b/appstore/slink/1.4.6/docker-compose.yml similarity index 94% rename from appstore/slink/1.4.5/docker-compose.yml rename to appstore/slink/1.4.6/docker-compose.yml index 56881f12..6845e2b0 100644 --- a/appstore/slink/1.4.5/docker-compose.yml +++ b/appstore/slink/1.4.6/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.4.5 + image: anirdev/slink:v1.4.6 labels: createdBy: Apps networks: diff --git a/appstore/slink/1.4.5/envs/default.env b/appstore/slink/1.4.6/envs/default.env similarity index 100% rename from appstore/slink/1.4.5/envs/default.env rename to appstore/slink/1.4.6/envs/default.env diff --git a/appstore/slink/1.4.5/envs/global.env b/appstore/slink/1.4.6/envs/global.env similarity index 100% rename from appstore/slink/1.4.5/envs/global.env rename to appstore/slink/1.4.6/envs/global.env diff --git a/appstore/slink/1.4.5/scripts/init.sh b/appstore/slink/1.4.6/scripts/init.sh similarity index 100% rename from appstore/slink/1.4.5/scripts/init.sh rename to appstore/slink/1.4.6/scripts/init.sh diff --git a/appstore/slink/1.4.5/scripts/uninstall.sh b/appstore/slink/1.4.6/scripts/uninstall.sh similarity index 100% rename from appstore/slink/1.4.5/scripts/uninstall.sh rename to appstore/slink/1.4.6/scripts/uninstall.sh diff --git a/appstore/slink/1.4.5/scripts/upgrade.sh b/appstore/slink/1.4.6/scripts/upgrade.sh similarity index 100% rename from appstore/slink/1.4.5/scripts/upgrade.sh rename to appstore/slink/1.4.6/scripts/upgrade.sh diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 0732d107..1cb607a9 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.792.0 + image: casbin/casdoor:v1.793.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 cfe4de52..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.1.8 + 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_0/.env b/dockge/movie-pilot_2_2_0/.env new file mode 100644 index 00000000..f2b00857 --- /dev/null +++ b/dockge/movie-pilot_2_2_0/.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_0/docker-compose.yml similarity index 89% rename from dockge/movie-pilot_1_9_17/docker-compose.yml rename to dockge/movie-pilot_2_2_0/docker-compose.yml index 1e72340a..ee76cd7a 100644 --- a/dockge/movie-pilot_1_9_17/docker-compose.yml +++ b/dockge/movie-pilot_2_2_0/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.0 labels: createdBy: Apps logging: diff --git a/dockge/movie-pilot_1_9_17/envs/default.env b/dockge/movie-pilot_2_2_0/envs/default.env similarity index 100% rename from dockge/movie-pilot_1_9_17/envs/default.env rename to dockge/movie-pilot_2_2_0/envs/default.env diff --git a/dockge/movie-pilot_1_9_17/envs/global.env b/dockge/movie-pilot_2_2_0/envs/global.env similarity index 100% rename from dockge/movie-pilot_1_9_17/envs/global.env rename to dockge/movie-pilot_2_2_0/envs/global.env diff --git a/dockge/movie-pilot_1_9_17/envs/movie-pilot.env b/dockge/movie-pilot_2_2_0/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_0/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_0/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/nocodb/docker-compose.yml b/dockge/nocodb/docker-compose.yml index fffce417..859a3324 100644 --- a/dockge/nocodb/docker-compose.yml +++ b/dockge/nocodb/docker-compose.yml @@ -17,7 +17,7 @@ services: - NC_SMTP_SECURE=true - NC_SMTP_IGNORE_TLS=false - NC_DB=${DB_TYPE}://${DB_HOSTNAME}:${DB_PORT}?u=${DB_USER}&p=${DB_PASSWD}&d=${DB_NAME} - image: nocodb/nocodb:0.260.0 + image: nocodb/nocodb:0.260.1 labels: createdBy: Apps networks: diff --git a/dockge/nodebb/conf/setup.json b/dockge/nodebb/conf/setup.json new file mode 100644 index 00000000..bc85928b --- /dev/null +++ b/dockge/nodebb/conf/setup.json @@ -0,0 +1,3 @@ +{ + "defaults": {} +} diff --git a/dockge/nodebb/docker-compose.yml b/dockge/nodebb/docker-compose.yml index 750460f3..cbc69642 100644 --- a/dockge/nodebb/docker-compose.yml +++ b/dockge/nodebb/docker-compose.yml @@ -20,6 +20,8 @@ services: - ${PANEL_APP_PORT_HTTP}:4567 restart: always volumes: + - ${NODEBB_ROOT_PATH}/node_modules:/usr/src/app/node_modules - ${NODEBB_ROOT_PATH}/build:/usr/src/app/build - ${NODEBB_ROOT_PATH}/uploads:/usr/src/app/public/uploads - ${NODEBB_ROOT_PATH}/config:/opt/config + - ${NODEBB_ROOT_PATH}/setup.json:/usr/src/app/setup.json diff --git a/dockge/slink/docker-compose.yml b/dockge/slink/docker-compose.yml index 56881f12..6845e2b0 100644 --- a/dockge/slink/docker-compose.yml +++ b/dockge/slink/docker-compose.yml @@ -12,7 +12,7 @@ services: - USER_PASSWORD_REQUIREMENTS=15 - IMAGE_MAX_SIZE=15M - STORAGE_PROVIDER=local - image: anirdev/slink:v1.4.5 + image: anirdev/slink:v1.4.6 labels: createdBy: Apps networks: