Merge remote-tracking branch 'origin/custom' into custom

# Conflicts: # apps/movie-pilot/2.8.0/data.yml
2026-06-16 01:02:14 +08:00 · 2025-09-16 10:33:38 +08:00
parent 3ea5006095 9a9218dcd9
commit a8320ac145
354 changed files with 254 additions and 376 deletions
@@ -4,7 +4,7 @@ networks:

 services:
  ani-rss:
-    image: wushuo894/ani-rss:v2.2.3
+    image: wushuo894/ani-rss:v2.2.6
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  napcat:
-    image: mlikiowa/napcat-docker:v4.8.110
+    image: mlikiowa/napcat-docker:v4.8.113
    container_name: napcat-${CONTAINER_NAME}
    restart: always
    networks:
@@ -24,7 +24,7 @@ services:
      - NAPCAT_UID=${NAPCAT_UID:-1000}
      - NAPCAT_GID=${NAPCAT_GID:-1000}
  astrbot:
-    image: soulter/astrbot:v4.0.0
+    image: soulter/astrbot:v4.1.2
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  astrbot:
-    image: soulter/astrbot:v4.0.0
+    image: soulter/astrbot:v4.1.2
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  casdoor:
-    image: casbin/casdoor:v2.56.0
+    image: casbin/casdoor:v2.59.0
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  cloudreve:
-    image: cloudreve/cloudreve:4.7.0
+    image: cloudreve/cloudreve:4.8.0
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  dozzle:
-    image: amir20/dozzle:v8.13.13
+    image: amir20/dozzle:v8.13.14
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  emby:
-    image: emby/embyserver:4.9.1.28
+    image: emby/embyserver:4.9.1.31
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  flaresolverr:
-    image: flaresolverr/flaresolverr:v3.4.0
+    image: flaresolverr/flaresolverr:v3.4.1
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  garage:
-    image: dxflrs/garage:v2.0.0
+    image: dxflrs/garage:v2.1.0
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  garage:
-    image: dxflrs/garage:v2.0.0
+    image: dxflrs/garage:v2.1.0
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  ghost:
-    image: ghost:6.0.7
+    image: ghost:6.0.9
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  homarr:
-    image: ghcr.io/homarr-labs/homarr:v1.36.1
+    image: ghcr.io/homarr-labs/homarr:v1.37.0
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -6,7 +6,7 @@ name: immich-machine-learning

 services:
  immich-machine-learning:
-    image: ghcr.io/immich-app/immich-machine-learning:v1.141.1
+    image: ghcr.io/immich-app/immich-machine-learning:v1.142.0
    container_name: immich-machine-learning-${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -26,7 +26,7 @@ services:
  immich-server:
    depends_on:
      - immich-pg14-vectors
-    image: ghcr.io/immich-app/immich-server:v1.141.1
+    image: ghcr.io/immich-app/immich-server:v1.142.0
    container_name: immich-server-${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -6,7 +6,7 @@ name: immich-server

 services:
  immich-server:
-    image: ghcr.io/immich-app/immich-server:v1.141.1
+    image: ghcr.io/immich-app/immich-server:v1.142.0
    container_name: immich-server-${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -26,7 +26,7 @@ services:
  immich-server:
    depends_on:
      - immich-pg14-vectors
-    image: ghcr.io/immich-app/immich-server:v1.141.1
+    image: ghcr.io/immich-app/immich-server:v1.142.0
    container_name: immich-server-${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -52,7 +52,7 @@ services:
      - /etc/localtime:/etc/localtime

  immich-machine-learning:
-    image: ghcr.io/immich-app/immich-machine-learning:v1.141.1
+    image: ghcr.io/immich-app/immich-machine-learning:v1.142.0
    container_name: immich-machine-learning-${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  mdc-ng:
-    image: mdcng/mdc:1.20.9
+    image: mdcng/mdc:1.20.10
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -1,189 +0,0 @@
-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
-      labelZh: 数据持久化路径
-      labelEn: Data persistence path
-      required: true
-      type: text
-    - default: 3000
-      edit: true
-      envKey: PANEL_APP_PORT_HTTP
-      labelZh: WebUI 端口
-      labelEn: WebUI Port
-      required: true
-      rule: paramPort
-      type: number
-    - default: 3001
-      edit: true
-      envKey: PANEL_APP_PORT_API
-      labelZh: API 端口
-      labelEn: API Port
-      required: true
-      rule: paramPort
-      type: number
-    - default: "admin"
-      edit: true
-      envKey: SUPERUSER
-      labelZh: 管理员用户名
-      labelEn: Superuser Username
-      required: true
-      type: text
-    - default: "moviepilot"
-      edit: true
-      envKey: API_TOKEN
-      labelZh: API 令牌
-      labelEn: API Token
-      required: true
-      type: password
-    - default: ""
-      edit: true
-      envKey: PROXY_HOST
-      labelZh: 网络代理
-      labelEn: Proxy Host
-      required: false
-      rule: paramExtUrl
-      type: text
-    - default: "false"
-      edit: true
-      envKey: AUTO_UPDATE_RESOURCE
-      labelZh: 自动更新资源包
-      labelEn: Auto Update Resources
-      required: true
-      type: select
-      values:
-        - label: 开启
-          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
-      labelEn: Custom mount directory 1
-      labelZh: 自定义挂载目录 1
-      required: false
-      type: text
-    - default: ""
-      edit: true
-      envKey: CUSTOM_MOUNT_DIRECTORY_2
-      labelEn: Custom mount directory 2
-      labelZh: 自定义挂载目录 2
-      required: false
-      type: text
-    - default: ""
-      edit: true
-      envKey: CUSTOM_MOUNT_DIRECTORY_3
-      labelEn: Custom mount directory 3
-      labelZh: 自定义挂载目录 3
-      required: false
-      type: text
-    - default: ""
-      edit: true
-      envKey: IYUU_SIGN
-      labelEn: IYUU Sign
-      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
@@ -1,38 +0,0 @@
-networks:
-  1panel-network:
-    external: true
-
-services:
-  movie-pilot:
-    image: jxxghp/moviepilot:2.7.9
-    container_name: ${CONTAINER_NAME}
-    labels:
-      createdBy: "Apps"
-    restart: always
-    stdin_open: true
-    tty: true
-    network_mode: ${NETWORK_MODE}
-    ports:
-      - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}
-      - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API}
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.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}/moviepilot:/moviepilot
-      - ${MOVIEPILOT_ROOT_PATH}/download:/download
-      - ${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=${PANEL_APP_PORT_HTTP}
-      - PORT=${PANEL_APP_PORT_API}
-      - DEBUG=false
-      - DEV=false
-      - LOG_LEVEL=INFO
-    logging:
-      driver: json-file
-      options:
-        max-size: 5m
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  sed -i '/^APP_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-  echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  sed -i '/^APP_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-  echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env
-
-  echo "Check Finish."
-else
-  echo "Error: .env file not found."
-fi
@@ -4,7 +4,7 @@ networks:

 services:
  music_tag_web:
-    image: xhongc/music_tag_web:2.5.6
+    image: xhongc/music_tag_web:2.5.7
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  n8n:
-    image: n8nio/n8n:1.111.0
+    image: n8nio/n8n:1.112.0
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/brave:3.0.7
+    image: ghcr.io/m1k1o/neko/brave:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/chromium:3.0.6
+    image: ghcr.io/m1k1o/neko/chromium:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/firefox:3.0.7
+    image: ghcr.io/m1k1o/neko/firefox:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/google-chrome:3.0.7
+    image: ghcr.io/m1k1o/neko/google-chrome:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/kde:3.0.7
+    image: ghcr.io/m1k1o/neko/kde:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/microsoft-edge:3.0.7
+    image: ghcr.io/m1k1o/neko/microsoft-edge:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/remmina:3.0.7
+    image: ghcr.io/m1k1o/neko/remmina:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/tor-browser:3.0.7
+    image: ghcr.io/m1k1o/neko/tor-browser:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/vlc:3.0.7
+    image: ghcr.io/m1k1o/neko/vlc:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  neko:
-    image: ghcr.io/m1k1o/neko/xfce:3.0.7
+    image: ghcr.io/m1k1o/neko/xfce:3.0.8
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  nodepassdash:
-    image: ghcr.io/nodepassproject/nodepassdash:3.0.0
+    image: ghcr.io/nodepassproject/nodepassdash:3.0.2
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  ollama:
-    image: ollama/ollama:0.11.10
+    image: ollama/ollama:0.11.11
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:

 services:
  openresty-manager:
-    image: uusec/openresty-manager:2.2.1
+    image: uusec/openresty-manager:2.3.3
    container_name: ${CONTAINER_NAME}
    labels:
      createdBy: "Apps"
@@ -23,7 +23,7 @@ services:
      timeout: 10s
      retries: 3
  rsshub:
-    image: diygod/rsshub:2025-09-11
+    image: diygod/rsshub:2025-09-15
    container_name: rsshub-${CONTAINER_NAME}
    depends_on:
      - browserless
--- a/Show More
+++ b/Show More