Merge remote-tracking branch 'origin/custom' into custom
# Conflicts: # apps/movie-pilot/2.8.0/data.yml
This commit is contained in:
11
.github/renovate.json
vendored
11
.github/renovate.json
vendored
@@ -7,7 +7,7 @@
|
||||
"rebaseWhen": "never",
|
||||
"prConcurrentLimit": 20,
|
||||
"automerge": true,
|
||||
"automergeType": "pr",
|
||||
"automergeType": "branch",
|
||||
"platformAutomerge": true,
|
||||
"enabledManagers": [
|
||||
"docker-compose",
|
||||
@@ -31,6 +31,15 @@
|
||||
"**/minio/2025-04-22/**"
|
||||
],
|
||||
"packageRules": [
|
||||
{
|
||||
"matchUpdateTypes": [
|
||||
"patch",
|
||||
"minor"
|
||||
],
|
||||
"automerge": true,
|
||||
"automergeType": "branch",
|
||||
"ignoreTests": true
|
||||
},
|
||||
{
|
||||
"matchFileNames": [
|
||||
"apps/postgresql/pg*/*.yml"
|
||||
|
||||
2
.github/workflows/renovate.yml
vendored
2
.github/workflows/renovate.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||
- name: Run Renovate
|
||||
uses: renovatebot/github-action@6927a58a017ee9ac468a34a5b0d2a9a9bd45cac3 # v43.0.11
|
||||
uses: renovatebot/github-action@f8af9272cd94a4637c29f60dea8731afd3134473 # v43.0.12
|
||||
with:
|
||||
useSlim: false
|
||||
token: ${{ secrets.GITHUBTOKEN }}
|
||||
|
||||
@@ -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,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
|
||||
@@ -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
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user