diff --git a/appstore/emby/4.9.1.19/.env b/appstore/emby/4.9.1.20/.env similarity index 100% rename from appstore/emby/4.9.1.19/.env rename to appstore/emby/4.9.1.20/.env diff --git a/appstore/emby/4.9.1.19/data.yml b/appstore/emby/4.9.1.20/data.yml similarity index 100% rename from appstore/emby/4.9.1.19/data.yml rename to appstore/emby/4.9.1.20/data.yml diff --git a/appstore/emby/4.9.1.19/docker-compose.yml b/appstore/emby/4.9.1.20/docker-compose.yml similarity index 96% rename from appstore/emby/4.9.1.19/docker-compose.yml rename to appstore/emby/4.9.1.20/docker-compose.yml index ad090efda..a04fc81ae 100644 --- a/appstore/emby/4.9.1.19/docker-compose.yml +++ b/appstore/emby/4.9.1.20/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.1.19 + image: emby/embyserver:4.9.1.20 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/emby/4.9.1.19/envs/default.env b/appstore/emby/4.9.1.20/envs/default.env similarity index 100% rename from appstore/emby/4.9.1.19/envs/default.env rename to appstore/emby/4.9.1.20/envs/default.env diff --git a/appstore/emby/4.9.1.19/envs/global.env b/appstore/emby/4.9.1.20/envs/global.env similarity index 100% rename from appstore/emby/4.9.1.19/envs/global.env rename to appstore/emby/4.9.1.20/envs/global.env diff --git a/appstore/emby/4.9.1.19/scripts/init.sh b/appstore/emby/4.9.1.20/scripts/init.sh similarity index 100% rename from appstore/emby/4.9.1.19/scripts/init.sh rename to appstore/emby/4.9.1.20/scripts/init.sh diff --git a/appstore/emby/4.9.1.19/scripts/uninstall.sh b/appstore/emby/4.9.1.20/scripts/uninstall.sh similarity index 100% rename from appstore/emby/4.9.1.19/scripts/uninstall.sh rename to appstore/emby/4.9.1.20/scripts/uninstall.sh diff --git a/appstore/emby/4.9.1.19/scripts/upgrade.sh b/appstore/emby/4.9.1.20/scripts/upgrade.sh similarity index 100% rename from appstore/emby/4.9.1.19/scripts/upgrade.sh rename to appstore/emby/4.9.1.20/scripts/upgrade.sh diff --git a/appstore/halo-h2/2.21.6/.env b/appstore/halo-h2/2.21.7/.env similarity index 100% rename from appstore/halo-h2/2.21.6/.env rename to appstore/halo-h2/2.21.7/.env diff --git a/appstore/halo-h2/2.21.6/data.yml b/appstore/halo-h2/2.21.7/data.yml similarity index 100% rename from appstore/halo-h2/2.21.6/data.yml rename to appstore/halo-h2/2.21.7/data.yml diff --git a/appstore/halo-h2/2.21.6/docker-compose.yml b/appstore/halo-h2/2.21.7/docker-compose.yml similarity index 93% rename from appstore/halo-h2/2.21.6/docker-compose.yml rename to appstore/halo-h2/2.21.7/docker-compose.yml index cabaf8afd..2faf926f6 100644 --- a/appstore/halo-h2/2.21.6/docker-compose.yml +++ b/appstore/halo-h2/2.21.7/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: halo-h2 environment: - JVM_OPTS=-Xmx256m -Xms256m - image: halohub/halo:2.21.6 + image: halohub/halo:2.21.7 labels: createdBy: Apps networks: diff --git a/appstore/halo-h2/2.21.6/envs/default.env b/appstore/halo-h2/2.21.7/envs/default.env similarity index 100% rename from appstore/halo-h2/2.21.6/envs/default.env rename to appstore/halo-h2/2.21.7/envs/default.env diff --git a/appstore/halo-h2/2.21.6/envs/global.env b/appstore/halo-h2/2.21.7/envs/global.env similarity index 100% rename from appstore/halo-h2/2.21.6/envs/global.env rename to appstore/halo-h2/2.21.7/envs/global.env diff --git a/appstore/halo-h2/2.21.6/scripts/init.sh b/appstore/halo-h2/2.21.7/scripts/init.sh similarity index 100% rename from appstore/halo-h2/2.21.6/scripts/init.sh rename to appstore/halo-h2/2.21.7/scripts/init.sh diff --git a/appstore/halo-h2/2.21.6/scripts/uninstall.sh b/appstore/halo-h2/2.21.7/scripts/uninstall.sh similarity index 100% rename from appstore/halo-h2/2.21.6/scripts/uninstall.sh rename to appstore/halo-h2/2.21.7/scripts/uninstall.sh diff --git a/appstore/halo-h2/2.21.6/scripts/upgrade.sh b/appstore/halo-h2/2.21.7/scripts/upgrade.sh similarity index 100% rename from appstore/halo-h2/2.21.6/scripts/upgrade.sh rename to appstore/halo-h2/2.21.7/scripts/upgrade.sh diff --git a/appstore/halo/2.21.6/.env b/appstore/halo/2.21.7/.env similarity index 100% rename from appstore/halo/2.21.6/.env rename to appstore/halo/2.21.7/.env diff --git a/appstore/halo/2.21.6/data.yml b/appstore/halo/2.21.7/data.yml similarity index 100% rename from appstore/halo/2.21.6/data.yml rename to appstore/halo/2.21.7/data.yml diff --git a/appstore/halo/2.21.6/docker-compose.yml b/appstore/halo/2.21.7/docker-compose.yml similarity index 95% rename from appstore/halo/2.21.6/docker-compose.yml rename to appstore/halo/2.21.7/docker-compose.yml index 10231bb1f..5bb7a34cc 100644 --- a/appstore/halo/2.21.6/docker-compose.yml +++ b/appstore/halo/2.21.7/docker-compose.yml @@ -11,7 +11,7 @@ services: - --halo.external-url=${HALO_EXTERNAL_URL} - --halo.security.remember-me.token-validity=${HALO_REMEMBER_ME_TOKEN_VALIDITY} container_name: halo - image: halohub/halo:2.21.6 + image: halohub/halo:2.21.7 labels: createdBy: Apps networks: diff --git a/appstore/halo/2.21.6/envs/default.env b/appstore/halo/2.21.7/envs/default.env similarity index 100% rename from appstore/halo/2.21.6/envs/default.env rename to appstore/halo/2.21.7/envs/default.env diff --git a/appstore/halo/2.21.6/envs/global.env b/appstore/halo/2.21.7/envs/global.env similarity index 100% rename from appstore/halo/2.21.6/envs/global.env rename to appstore/halo/2.21.7/envs/global.env diff --git a/appstore/halo/2.21.6/scripts/init.sh b/appstore/halo/2.21.7/scripts/init.sh similarity index 100% rename from appstore/halo/2.21.6/scripts/init.sh rename to appstore/halo/2.21.7/scripts/init.sh diff --git a/appstore/halo/2.21.6/scripts/uninstall.sh b/appstore/halo/2.21.7/scripts/uninstall.sh similarity index 100% rename from appstore/halo/2.21.6/scripts/uninstall.sh rename to appstore/halo/2.21.7/scripts/uninstall.sh diff --git a/appstore/halo/2.21.6/scripts/upgrade.sh b/appstore/halo/2.21.7/scripts/upgrade.sh similarity index 100% rename from appstore/halo/2.21.6/scripts/upgrade.sh rename to appstore/halo/2.21.7/scripts/upgrade.sh diff --git a/appstore/movie-pilot/1.9.19/.env b/appstore/movie-pilot/2.7.3/.env similarity index 100% rename from appstore/movie-pilot/1.9.19/.env rename to appstore/movie-pilot/2.7.3/.env diff --git a/appstore/movie-pilot/2.7.2/.env b/appstore/movie-pilot/2.7.3/2.7.2/.env similarity index 100% rename from appstore/movie-pilot/2.7.2/.env rename to appstore/movie-pilot/2.7.3/2.7.2/.env diff --git a/appstore/movie-pilot/2.7.2/data.yml b/appstore/movie-pilot/2.7.3/2.7.2/data.yml similarity index 100% rename from appstore/movie-pilot/2.7.2/data.yml rename to appstore/movie-pilot/2.7.3/2.7.2/data.yml diff --git a/appstore/movie-pilot/2.7.2/docker-compose.yml b/appstore/movie-pilot/2.7.3/2.7.2/docker-compose.yml similarity index 93% rename from appstore/movie-pilot/2.7.2/docker-compose.yml rename to appstore/movie-pilot/2.7.3/2.7.2/docker-compose.yml index 59a72d0ee..da77f1b93 100644 --- a/appstore/movie-pilot/2.7.2/docker-compose.yml +++ b/appstore/movie-pilot/2.7.3/2.7.2/docker-compose.yml @@ -3,10 +3,10 @@ networks: external: true services: movie-pilot-v2: - container_name: movie-pilot + container_name: 2.7.3 env_file: - ./envs/global.env - - ./envs/movie-pilot.env + - ./envs/2.7.3.env - .env environment: - NGINX_PORT=3000 @@ -19,7 +19,7 @@ services: - 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.2 + image: jxxghp/moviepilot-v2:2.7.3 labels: createdBy: Apps logging: diff --git a/appstore/movie-pilot/1.9.19/envs/default.env b/appstore/movie-pilot/2.7.3/2.7.2/envs/default.env similarity index 100% rename from appstore/movie-pilot/1.9.19/envs/default.env rename to appstore/movie-pilot/2.7.3/2.7.2/envs/default.env diff --git a/appstore/movie-pilot/1.9.19/envs/global.env b/appstore/movie-pilot/2.7.3/2.7.2/envs/global.env similarity index 100% rename from appstore/movie-pilot/1.9.19/envs/global.env rename to appstore/movie-pilot/2.7.3/2.7.2/envs/global.env diff --git a/appstore/movie-pilot/2.7.2/envs/movie-pilot.env b/appstore/movie-pilot/2.7.3/2.7.2/envs/movie-pilot.env similarity index 100% rename from appstore/movie-pilot/2.7.2/envs/movie-pilot.env rename to appstore/movie-pilot/2.7.3/2.7.2/envs/movie-pilot.env diff --git a/appstore/movie-pilot/1.9.19/scripts/init.sh b/appstore/movie-pilot/2.7.3/2.7.2/scripts/init.sh similarity index 100% rename from appstore/movie-pilot/1.9.19/scripts/init.sh rename to appstore/movie-pilot/2.7.3/2.7.2/scripts/init.sh diff --git a/appstore/movie-pilot/1.9.19/scripts/uninstall.sh b/appstore/movie-pilot/2.7.3/2.7.2/scripts/uninstall.sh similarity index 100% rename from appstore/movie-pilot/1.9.19/scripts/uninstall.sh rename to appstore/movie-pilot/2.7.3/2.7.2/scripts/uninstall.sh diff --git a/appstore/movie-pilot/1.9.19/scripts/upgrade.sh b/appstore/movie-pilot/2.7.3/2.7.2/scripts/upgrade.sh similarity index 100% rename from appstore/movie-pilot/1.9.19/scripts/upgrade.sh rename to appstore/movie-pilot/2.7.3/2.7.2/scripts/upgrade.sh diff --git a/appstore/movie-pilot/1.9.19/data.yml b/appstore/movie-pilot/2.7.3/data.yml similarity index 100% rename from appstore/movie-pilot/1.9.19/data.yml rename to appstore/movie-pilot/2.7.3/data.yml diff --git a/dockge/movie-pilot_1_9_19/docker-compose.yml b/appstore/movie-pilot/2.7.3/docker-compose.yml similarity index 96% rename from dockge/movie-pilot_1_9_19/docker-compose.yml rename to appstore/movie-pilot/2.7.3/docker-compose.yml index 79013beca..648a415a9 100644 --- a/dockge/movie-pilot_1_9_19/docker-compose.yml +++ b/appstore/movie-pilot/2.7.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - PUID=0 - PGID=0 - UMASK=022 - image: jxxghp/moviepilot:1.9.19 + image: jxxghp/moviepilot:2.7.3 labels: createdBy: Apps logging: diff --git a/appstore/movie-pilot/2.7.2/envs/default.env b/appstore/movie-pilot/2.7.3/envs/default.env similarity index 100% rename from appstore/movie-pilot/2.7.2/envs/default.env rename to appstore/movie-pilot/2.7.3/envs/default.env diff --git a/appstore/movie-pilot/2.7.2/envs/global.env b/appstore/movie-pilot/2.7.3/envs/global.env similarity index 100% rename from appstore/movie-pilot/2.7.2/envs/global.env rename to appstore/movie-pilot/2.7.3/envs/global.env diff --git a/appstore/movie-pilot/1.9.19/envs/movie-pilot.env b/appstore/movie-pilot/2.7.3/envs/movie-pilot.env similarity index 100% rename from appstore/movie-pilot/1.9.19/envs/movie-pilot.env rename to appstore/movie-pilot/2.7.3/envs/movie-pilot.env diff --git a/appstore/movie-pilot/2.7.2/scripts/init.sh b/appstore/movie-pilot/2.7.3/scripts/init.sh similarity index 100% rename from appstore/movie-pilot/2.7.2/scripts/init.sh rename to appstore/movie-pilot/2.7.3/scripts/init.sh diff --git a/appstore/movie-pilot/2.7.2/scripts/uninstall.sh b/appstore/movie-pilot/2.7.3/scripts/uninstall.sh similarity index 100% rename from appstore/movie-pilot/2.7.2/scripts/uninstall.sh rename to appstore/movie-pilot/2.7.3/scripts/uninstall.sh diff --git a/appstore/movie-pilot/2.7.2/scripts/upgrade.sh b/appstore/movie-pilot/2.7.3/scripts/upgrade.sh similarity index 100% rename from appstore/movie-pilot/2.7.2/scripts/upgrade.sh rename to appstore/movie-pilot/2.7.3/scripts/upgrade.sh diff --git a/appstore/nexus3/3.83.0/.env b/appstore/nexus3/3.83.1/.env similarity index 100% rename from appstore/nexus3/3.83.0/.env rename to appstore/nexus3/3.83.1/.env diff --git a/appstore/nexus3/3.83.0/data.yml b/appstore/nexus3/3.83.1/data.yml similarity index 100% rename from appstore/nexus3/3.83.0/data.yml rename to appstore/nexus3/3.83.1/data.yml diff --git a/appstore/nexus3/3.83.0/docker-compose.yml b/appstore/nexus3/3.83.1/docker-compose.yml similarity index 90% rename from appstore/nexus3/3.83.0/docker-compose.yml rename to appstore/nexus3/3.83.1/docker-compose.yml index 0edc5a368..be5fd3886 100644 --- a/appstore/nexus3/3.83.0/docker-compose.yml +++ b/appstore/nexus3/3.83.1/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sonatype/nexus3:3.83.0-alpine + image: sonatype/nexus3:3.83.1-alpine labels: createdBy: Apps networks: diff --git a/appstore/nexus3/3.83.0/envs/default.env b/appstore/nexus3/3.83.1/envs/default.env similarity index 100% rename from appstore/nexus3/3.83.0/envs/default.env rename to appstore/nexus3/3.83.1/envs/default.env diff --git a/appstore/nexus3/3.83.0/envs/global.env b/appstore/nexus3/3.83.1/envs/global.env similarity index 100% rename from appstore/nexus3/3.83.0/envs/global.env rename to appstore/nexus3/3.83.1/envs/global.env diff --git a/appstore/nexus3/3.83.0/scripts/init.sh b/appstore/nexus3/3.83.1/scripts/init.sh similarity index 100% rename from appstore/nexus3/3.83.0/scripts/init.sh rename to appstore/nexus3/3.83.1/scripts/init.sh diff --git a/appstore/nexus3/3.83.0/scripts/uninstall.sh b/appstore/nexus3/3.83.1/scripts/uninstall.sh similarity index 100% rename from appstore/nexus3/3.83.0/scripts/uninstall.sh rename to appstore/nexus3/3.83.1/scripts/uninstall.sh diff --git a/appstore/nexus3/3.83.0/scripts/upgrade.sh b/appstore/nexus3/3.83.1/scripts/upgrade.sh similarity index 100% rename from appstore/nexus3/3.83.0/scripts/upgrade.sh rename to appstore/nexus3/3.83.1/scripts/upgrade.sh diff --git a/appstore/ollama/0.11.4/.env b/appstore/ollama/0.11.5/.env similarity index 100% rename from appstore/ollama/0.11.4/.env rename to appstore/ollama/0.11.5/.env diff --git a/appstore/ollama/0.11.4/data.yml b/appstore/ollama/0.11.5/data.yml similarity index 100% rename from appstore/ollama/0.11.4/data.yml rename to appstore/ollama/0.11.5/data.yml diff --git a/appstore/ollama/0.11.4/docker-compose.yml b/appstore/ollama/0.11.5/docker-compose.yml similarity index 95% rename from appstore/ollama/0.11.4/docker-compose.yml rename to appstore/ollama/0.11.5/docker-compose.yml index b8a37938f..cfbb321d9 100644 --- a/appstore/ollama/0.11.4/docker-compose.yml +++ b/appstore/ollama/0.11.5/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.11.4 + image: ollama/ollama:0.11.5 labels: createdBy: Apps networks: diff --git a/appstore/ollama/0.11.4/envs/default.env b/appstore/ollama/0.11.5/envs/default.env similarity index 100% rename from appstore/ollama/0.11.4/envs/default.env rename to appstore/ollama/0.11.5/envs/default.env diff --git a/appstore/ollama/0.11.4/envs/global.env b/appstore/ollama/0.11.5/envs/global.env similarity index 100% rename from appstore/ollama/0.11.4/envs/global.env rename to appstore/ollama/0.11.5/envs/global.env diff --git a/appstore/ollama/0.11.4/scripts/init.sh b/appstore/ollama/0.11.5/scripts/init.sh similarity index 100% rename from appstore/ollama/0.11.4/scripts/init.sh rename to appstore/ollama/0.11.5/scripts/init.sh diff --git a/appstore/ollama/0.11.4/scripts/uninstall.sh b/appstore/ollama/0.11.5/scripts/uninstall.sh similarity index 100% rename from appstore/ollama/0.11.4/scripts/uninstall.sh rename to appstore/ollama/0.11.5/scripts/uninstall.sh diff --git a/appstore/ollama/0.11.4/scripts/upgrade.sh b/appstore/ollama/0.11.5/scripts/upgrade.sh similarity index 100% rename from appstore/ollama/0.11.4/scripts/upgrade.sh rename to appstore/ollama/0.11.5/scripts/upgrade.sh diff --git a/appstore/traccar/6.8/.env b/appstore/traccar/6.9/.env similarity index 100% rename from appstore/traccar/6.8/.env rename to appstore/traccar/6.9/.env diff --git a/appstore/traccar/6.8/conf/traccar.xml b/appstore/traccar/6.9/conf/traccar.xml similarity index 100% rename from appstore/traccar/6.8/conf/traccar.xml rename to appstore/traccar/6.9/conf/traccar.xml diff --git a/appstore/traccar/6.8/data.yml b/appstore/traccar/6.9/data.yml similarity index 100% rename from appstore/traccar/6.8/data.yml rename to appstore/traccar/6.9/data.yml diff --git a/appstore/traccar/6.8/docker-compose.yml b/appstore/traccar/6.9/docker-compose.yml similarity index 93% rename from appstore/traccar/6.8/docker-compose.yml rename to appstore/traccar/6.9/docker-compose.yml index 6781141f9..98107bdd9 100644 --- a/appstore/traccar/6.8/docker-compose.yml +++ b/appstore/traccar/6.9/docker-compose.yml @@ -8,7 +8,7 @@ services: - ./envs/global.env - .env hostname: traccar - image: traccar/traccar:6.8 + image: traccar/traccar:6.9 labels: createdBy: Apps networks: diff --git a/appstore/traccar/6.8/envs/default.env b/appstore/traccar/6.9/envs/default.env similarity index 100% rename from appstore/traccar/6.8/envs/default.env rename to appstore/traccar/6.9/envs/default.env diff --git a/appstore/traccar/6.8/envs/global.env b/appstore/traccar/6.9/envs/global.env similarity index 100% rename from appstore/traccar/6.8/envs/global.env rename to appstore/traccar/6.9/envs/global.env diff --git a/appstore/traccar/6.8/scripts/init.sh b/appstore/traccar/6.9/scripts/init.sh similarity index 100% rename from appstore/traccar/6.8/scripts/init.sh rename to appstore/traccar/6.9/scripts/init.sh diff --git a/appstore/traccar/6.8/scripts/uninstall.sh b/appstore/traccar/6.9/scripts/uninstall.sh similarity index 100% rename from appstore/traccar/6.8/scripts/uninstall.sh rename to appstore/traccar/6.9/scripts/uninstall.sh diff --git a/appstore/traccar/6.8/scripts/upgrade.sh b/appstore/traccar/6.9/scripts/upgrade.sh similarity index 100% rename from appstore/traccar/6.8/scripts/upgrade.sh rename to appstore/traccar/6.9/scripts/upgrade.sh diff --git a/dockge/2.7.3/.env b/dockge/2.7.3/.env new file mode 100644 index 000000000..394ed4126 --- /dev/null +++ b/dockge/2.7.3/.env @@ -0,0 +1,36 @@ +# 数据持久化路径 [必填] +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= + +# 重启时自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false + +# 自动更新资源包 [必填] +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/appstore/movie-pilot/1.9.19/docker-compose.yml b/dockge/2.7.3/docker-compose.yml similarity index 63% rename from appstore/movie-pilot/1.9.19/docker-compose.yml rename to dockge/2.7.3/docker-compose.yml index 79013beca..da77f1b93 100644 --- a/appstore/movie-pilot/1.9.19/docker-compose.yml +++ b/dockge/2.7.3/docker-compose.yml @@ -2,11 +2,11 @@ networks: 1panel-network: external: true services: - movie-pilot: - container_name: movie-pilot + movie-pilot-v2: + container_name: 2.7.3 env_file: - ./envs/global.env - - ./envs/movie-pilot.env + - ./envs/2.7.3.env - .env environment: - NGINX_PORT=3000 @@ -14,7 +14,12 @@ services: - PUID=0 - PGID=0 - UMASK=022 - image: jxxghp/moviepilot:1.9.19 + - 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 labels: createdBy: Apps logging: @@ -32,8 +37,9 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - ${MOVIEPILOT_ROOT_PATH}/config:/config - - ${MOVIEPILOT_ROOT_PATH}/moviepilot:/moviepilot + - ${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} diff --git a/dockge/movie-pilot_1_9_19/envs/default.env b/dockge/2.7.3/envs/default.env similarity index 100% rename from dockge/movie-pilot_1_9_19/envs/default.env rename to dockge/2.7.3/envs/default.env diff --git a/dockge/movie-pilot_1_9_19/envs/global.env b/dockge/2.7.3/envs/global.env similarity index 100% rename from dockge/movie-pilot_1_9_19/envs/global.env rename to dockge/2.7.3/envs/global.env diff --git a/dockge/movie-pilot_1_9_19/envs/movie-pilot.env b/dockge/2.7.3/envs/movie-pilot.env similarity index 75% rename from dockge/movie-pilot_1_9_19/envs/movie-pilot.env rename to dockge/2.7.3/envs/movie-pilot.env index d244ac86f..78ba50bf1 100644 --- a/dockge/movie-pilot_1_9_19/envs/movie-pilot.env +++ b/dockge/2.7.3/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/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index ad090efda..a04fc81ae 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.1.19 + image: emby/embyserver:4.9.1.20 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/halo-h2/docker-compose.yml b/dockge/halo-h2/docker-compose.yml index cabaf8afd..2faf926f6 100644 --- a/dockge/halo-h2/docker-compose.yml +++ b/dockge/halo-h2/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: halo-h2 environment: - JVM_OPTS=-Xmx256m -Xms256m - image: halohub/halo:2.21.6 + image: halohub/halo:2.21.7 labels: createdBy: Apps networks: diff --git a/dockge/halo/docker-compose.yml b/dockge/halo/docker-compose.yml index 10231bb1f..5bb7a34cc 100644 --- a/dockge/halo/docker-compose.yml +++ b/dockge/halo/docker-compose.yml @@ -11,7 +11,7 @@ services: - --halo.external-url=${HALO_EXTERNAL_URL} - --halo.security.remember-me.token-validity=${HALO_REMEMBER_ME_TOKEN_VALIDITY} container_name: halo - image: halohub/halo:2.21.6 + image: halohub/halo:2.21.7 labels: createdBy: Apps networks: diff --git a/dockge/movie-pilot/.env b/dockge/movie-pilot/.env index 394ed4126..a66ae0c61 100644 --- a/dockge/movie-pilot/.env +++ b/dockge/movie-pilot/.env @@ -16,11 +16,11 @@ API_TOKEN=moviepilot # 网络代理 PROXY_HOST= -# 重启时自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false - # 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCE=false +AUTO_UPDATE_RESOURCES=false + +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= @@ -34,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/2.7.2/docker-compose.yml b/dockge/movie-pilot/2.7.2/docker-compose.yml new file mode 100644 index 000000000..64fb2d218 --- /dev/null +++ b/dockge/movie-pilot/2.7.2/docker-compose.yml @@ -0,0 +1,46 @@ +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/default.env b/dockge/movie-pilot/2.7.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/movie-pilot/2.7.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/movie-pilot/2.7.2/envs/global.env b/dockge/movie-pilot/2.7.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/movie-pilot/2.7.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/movie-pilot/2.7.2/envs/movie-pilot.env b/dockge/movie-pilot/2.7.2/envs/movie-pilot.env new file mode 100644 index 000000000..78ba50bf1 --- /dev/null +++ b/dockge/movie-pilot/2.7.2/envs/movie-pilot.env @@ -0,0 +1,63 @@ +####################################################################### +# 【*】为必配项,其余为选配项,选配项可以删除整项配置项或者保留配置默认值 # +####################################################################### +# 【*】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/docker-compose.yml b/dockge/movie-pilot/docker-compose.yml index 59a72d0ee..648a415a9 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,12 +14,7 @@ services: - 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.2 + image: jxxghp/moviepilot:2.7.3 labels: createdBy: Apps logging: @@ -37,9 +32,8 @@ services: 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/movie-pilot/envs/movie-pilot.env b/dockge/movie-pilot/envs/movie-pilot.env index 78ba50bf1..d244ac86f 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_19/.env b/dockge/movie-pilot_1_9_19/.env deleted file mode 100644 index a66ae0c61..000000000 --- a/dockge/movie-pilot_1_9_19/.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/nexus3/docker-compose.yml b/dockge/nexus3/docker-compose.yml index 0edc5a368..be5fd3886 100644 --- a/dockge/nexus3/docker-compose.yml +++ b/dockge/nexus3/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: sonatype/nexus3:3.83.0-alpine + image: sonatype/nexus3:3.83.1-alpine labels: createdBy: Apps networks: diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml index b8a37938f..cfbb321d9 100644 --- a/dockge/ollama/docker-compose.yml +++ b/dockge/ollama/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.11.4 + image: ollama/ollama:0.11.5 labels: createdBy: Apps networks: diff --git a/dockge/traccar/docker-compose.yml b/dockge/traccar/docker-compose.yml index 6781141f9..98107bdd9 100644 --- a/dockge/traccar/docker-compose.yml +++ b/dockge/traccar/docker-compose.yml @@ -8,7 +8,7 @@ services: - ./envs/global.env - .env hostname: traccar - image: traccar/traccar:6.8 + image: traccar/traccar:6.9 labels: createdBy: Apps networks: