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

This commit is contained in:
ms
2026-01-20 13:55:25 +08:00
525 changed files with 727 additions and 118 deletions
@@ -11,7 +11,7 @@ services:
- TZ=Asia/Shanghai
- NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080}
- AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523}
image: qyg2297248353/ammds:v1.6.42
image: qyg2297248353/ammds:v1.6.46
labels:
createdBy: Apps
network_mode: ${NETWORK_MODE:-host}
@@ -14,7 +14,7 @@ services:
- PORT=7789
- CONFIG=/config
- TZ=Asia/Shanghai
image: wushuo894/ani-rss:v2.4.26
image: wushuo894/ani-rss:v2.4.32
labels:
createdBy: Apps
networks:
@@ -9,7 +9,7 @@ services:
- .env
environment:
- TZ=Asia/Shanghai
image: soulter/astrbot:v4.11.4
image: soulter/astrbot:v4.12.3
labels:
createdBy: Apps
networks:
@@ -36,7 +36,7 @@ services:
- MODE=astrbot
- NAPCAT_UID=${NAPCAT_UID:-1000}
- NAPCAT_GID=${NAPCAT_GID:-1000}
image: mlikiowa/napcat-docker:v4.10.15
image: mlikiowa/napcat-docker:v4.10.35
mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02}
networks:
- 1panel-network
@@ -9,7 +9,7 @@ services:
- .env
environment:
- TZ=Asia/Shanghai
image: soulter/astrbot:v4.11.4
image: soulter/astrbot:v4.12.3
labels:
createdBy: Apps
networks:
@@ -14,7 +14,7 @@ services:
- verificationCodeTimeout=10
- appname=casdoor
- authState=casdoor
image: casbin/casdoor:2.246.0
image: casbin/casdoor:2.253.0
labels:
createdBy: Apps
networks:
@@ -19,7 +19,7 @@ services:
'
timeout: 3s
image: jiangrui1994/cloudsaver:0.6.2
image: jiangrui1994/cloudsaver:0.6.5
labels:
createdBy: Apps
networks:
@@ -20,7 +20,7 @@ services:
- /dozzle
- healthcheck
timeout: 30s
image: amir20/dozzle:v9.0.1
image: amir20/dozzle:v9.0.2
labels:
createdBy: Apps
networks:
@@ -14,7 +14,7 @@ services:
- database__client=mysql
- mail__options__service=Email
- mail__options__secure=true
image: ghost:6.12.1
image: ghost:6.13.2
labels:
createdBy: Apps
networks:
+3 -3
View File
@@ -58,7 +58,7 @@ services:
- -f
- http://localhost:8000/api/health
timeout: 5s
image: ghcr.io/leslieleung/glean-backend:0.2.3
image: ghcr.io/leslieleung/glean-backend:0.2.4
labels:
createdBy: Apps
networks:
@@ -113,7 +113,7 @@ services:
env_file:
- ./envs/global.env
- .env
image: ghcr.io/leslieleung/glean-web:0.2.3
image: ghcr.io/leslieleung/glean-web:0.2.4
networks:
- glean-network
ports:
@@ -141,7 +141,7 @@ services:
DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-glean}:${POSTGRES_PASSWORD:-glean}@postgres:5432/${POSTGRES_DB:-glean}
REDIS_URL: redis://redis:6379/0
SECRET_KEY: ${SECRET_KEY:-}
image: ghcr.io/leslieleung/glean-backend:0.2.3
image: ghcr.io/leslieleung/glean-backend:0.2.4
networks:
- glean-network
restart: always
@@ -9,7 +9,7 @@ services:
container_name: halo-h2
environment:
- JVM_OPTS=-Xmx256m -Xms256m
image: halohub/halo:2.22.9
image: halohub/halo:2.22.11
labels:
createdBy: Apps
networks:
@@ -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.22.9
image: halohub/halo:2.22.11
labels:
createdBy: Apps
networks:
@@ -7,7 +7,7 @@ services:
env_file:
- ./envs/global.env
- .env
image: ghcr.io/homarr-labs/homarr:v1.50.0
image: ghcr.io/homarr-labs/homarr:v1.50.1
labels:
createdBy: Apps
network_mode: ${NETWORK_MODE}
+6
View File
@@ -0,0 +1,6 @@
# 数据持久化路径 [必填]
JACKETT_ROOT_PATH=/home/jackett
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=9117
+17
View File
@@ -0,0 +1,17 @@
additionalProperties:
formFields:
- default: "/home/jackett"
edit: true
envKey: JACKETT_ROOT_PATH
labelZh: 数据持久化路径
labelEn: Data persistence path
required: true
type: text
- default: 9117
edit: true
envKey: PANEL_APP_PORT_HTTP
labelZh: WebUI 端口
labelEn: WebUI port
required: true
rule: paramPort
type: number
@@ -0,0 +1,24 @@
networks:
1panel-network:
external: true
services:
jackett:
container_name: jackett
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- PUID=1000
- PGID=1000
image: linuxserver/jackett:0.24.887
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:9117
restart: always
volumes:
- ${JACKETT_ROOT_PATH}/config:/config
- ${JACKETT_ROOT_PATH}/downloads:/downloads
+24
View File
@@ -0,0 +1,24 @@
#!/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
echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
# setup-2 create dir
mkdir -p "$JACKETT_ROOT_PATH"
mkdir -p "$JACKETT_ROOT_PATH/config"
mkdir -p "$JACKETT_ROOT_PATH/downloads"
chown -R 1000:1000 "$JACKETT_ROOT_PATH"
echo "Check Finish."
else
echo "Error: .env file not found."
fi

Some files were not shown because too many files have changed in this diff Show More