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

This commit is contained in:
2025-07-24 16:42:51 +08:00
97 changed files with 359 additions and 94 deletions
@@ -4,7 +4,7 @@ networks:
services:
minio:
image: minio/minio:RELEASE.2025-07-18T21-56-31Z
image: minio/minio:RELEASE.2025-07-23T15-54-02Z
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:
services:
n8n:
image: n8nio/n8n:1.104.0
image: n8nio/n8n:1.104.1
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"
@@ -4,7 +4,7 @@ networks:
services:
nodepassdash:
image: ghcr.io/nodepassproject/nodepassdash:2.2.0
image: ghcr.io/nodepassproject/nodepassdash:2.2.1
container_name: ${CONTAINER_NAME}
labels:
createdBy: "Apps"
@@ -23,7 +23,7 @@ services:
timeout: 10s
retries: 3
rsshub:
image: diygod/rsshub:2025-07-22
image: diygod/rsshub:2025-07-23
container_name: rsshub-${CONTAINER_NAME}
depends_on:
- browserless
+3 -15
View File
@@ -24,21 +24,6 @@ services:
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-scheduler:
command: schedule --foreground --update --every=day
container_name: scheduler-archivebox
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- TIMEOUT=120
- SEARCH_BACKEND_ENGINE=sonic
- SEARCH_BACKEND_HOST_NAME=archivebox-sonic
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
image: archivebox/archivebox:0.7.3
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-sonic:
container_name: sonic-archivebox
env_file:
@@ -50,5 +35,8 @@ services:
expose:
- 1491
image: archivebox/sonic:latest
networks:
- 1panel-network
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store
+21
View File
@@ -0,0 +1,21 @@
# 数据持久化路径 [必填]
ARCHIVEBOX_ROOT_PATH=/home/archivebox
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=8000
# 管理员用户名 [必填]
ADMIN_USERNAME=archivebox
# 管理员密码 [必填]
ADMIN_PASSWORD=archivebox
# 是否公开快照列表 [必填]
PUBLIC_INDEX=True
# 是否公开快照内容 [必填]
PUBLIC_SNAPSHOTS=True
# 是否允许匿名用户提交存档 [必填]
PUBLIC_ADD_VIEW=False
+67
View File
@@ -0,0 +1,67 @@
additionalProperties:
formFields:
- default: "/home/archivebox"
edit: true
envKey: ARCHIVEBOX_ROOT_PATH
labelZh: 数据持久化路径
labelEn: Data persistence path
required: true
type: text
- default: 8000
edit: true
envKey: PANEL_APP_PORT_HTTP
labelZh: WebUI 端口
labelEn: WebUI port
required: true
rule: paramPort
type: number
- default: "archivebox"
edit: true
envKey: ADMIN_USERNAME
labelZh: 管理员用户名
labelEn: Admin Username
required: true
type: text
- default: "archivebox"
edit: true
envKey: ADMIN_PASSWORD
labelZh: 管理员密码
labelEn: Admin Password
required: true
type: password
- default: "True"
edit: true
envKey: PUBLIC_INDEX
labelZh: 是否公开快照列表
labelEn: Whether to make the snapshot list public
required: true
type: select
values:
- label: 公开
value: "True"
- label: 私密
value: "False"
- default: "True"
edit: true
envKey: PUBLIC_SNAPSHOTS
labelZh: 是否公开快照内容
labelEn: Whether to make snapshot content public
required: true
type: select
values:
- label: 公开
value: "True"
- label: 私密
value: "False"
- default: "False"
edit: true
envKey: PUBLIC_ADD_VIEW
labelZh: 是否允许匿名用户提交存档
labelEn: Whether to allow anonymous users to submit archives
required: true
type: select
values:
- label: 允许
value: "True"
- label: 禁止
value: "False"
@@ -0,0 +1,64 @@
networks:
1panel-network:
external: true
services:
archivebox:
container_name: archivebox
depends_on:
- archivebox-init
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- ALLOWED_HOSTS=*
- CSRF_TRUSTED_ORIGINS=http://localhost:8000
- SEARCH_BACKEND_ENGINE=sonic
- SEARCH_BACKEND_HOST_NAME=archivebox-sonic
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
image: archivebox/archivebox:0.8.5rc51
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:8000
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-init:
command: archivebox init
container_name: init-archivebox
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- ALLOWED_HOSTS=*
- CSRF_TRUSTED_ORIGINS=http://localhost:8000
- SEARCH_BACKEND_ENGINE=sonic
- SEARCH_BACKEND_HOST_NAME=archivebox-sonic
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
image: archivebox/archivebox:0.8.5rc51
labels:
createdBy: Apps
networks:
- 1panel-network
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-sonic:
container_name: sonic-archivebox
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
expose:
- 1491
image: archivebox/sonic:latest
networks:
- 1panel-network
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store
@@ -1,26 +0,0 @@
networks:
1panel-network:
external: true
services:
auto-lady:
container_name: byte-muse
env_file:
- ./envs/global.env
- .env
environment:
- HTTPS_PROXY=${HTTP_PROXY}
- HTTP_PROXY=${HTTP_PROXY:-}
- NO_PROXY=${NO_PROXY:-}
image: envyafish/byte-muse:1.15.0
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:80
restart: always
volumes:
- ${AUTO_LADY_ROOT_PATH}/config:/data
- ${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}
@@ -11,7 +11,7 @@ services:
- HTTPS_PROXY=${HTTP_PROXY}
- HTTP_PROXY=${HTTP_PROXY:-}
- NO_PROXY=${NO_PROXY:-}
image: envyafish/byte-muse:1.15.0
image: envyafish/byte-muse:1.15.1
labels:
createdBy: Apps
networks:
@@ -15,7 +15,7 @@ services:
- MINIO_BROWSER_REDIRECT=true
extra_hosts:
- ${MINIO_SERVER_HOST:-localhost}:127.0.0.1
image: minio/minio:RELEASE.2025-07-18T21-56-31Z
image: minio/minio:RELEASE.2025-07-23T15-54-02Z
labels:
createdBy: Apps
logging:
@@ -14,7 +14,7 @@ services:
- N8N_PROTOCOL=http
- N8N_DIAGNOSTICS_ENABLED=false
- N8N_SECURE_COOKIE=false
image: n8nio/n8n:1.104.0
image: n8nio/n8n:1.104.1
labels:
createdBy: Apps
networks:
@@ -10,7 +10,7 @@ services:
environment:
- TZ=Asia/Shanghai
- PORT=${PANEL_APP_PORT_HTTP}
image: ghcr.io/nodepassproject/nodepassdash:2.2.0
image: ghcr.io/nodepassproject/nodepassdash:2.2.1
labels:
createdBy: Apps
network_mode: ${NETWORK_MODE}
@@ -57,7 +57,7 @@ services:
- -f
- http://localhost:1200/healthz?key=${ACCESS_KEY}
timeout: 10s
image: diygod/rsshub:2025-07-22
image: diygod/rsshub:2025-07-23
labels:
createdBy: Apps
networks:
@@ -0,0 +1,17 @@
#!/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
echo "Check Finish."
else
echo "Error: .env file not found."
fi
@@ -0,0 +1,10 @@
#!/bin/bash
if [ -f .env ]; then
source .env
echo "Check Finish."
else
echo "Error: .env file not found."
fi
@@ -0,0 +1,17 @@
#!/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
echo "Check Finish."
else
echo "Error: .env file not found."
fi
+3 -15
View File
@@ -24,21 +24,6 @@ services:
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-scheduler:
command: schedule --foreground --update --every=day
container_name: scheduler-archivebox
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- TIMEOUT=120
- SEARCH_BACKEND_ENGINE=sonic
- SEARCH_BACKEND_HOST_NAME=archivebox-sonic
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
image: archivebox/archivebox:0.7.3
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-sonic:
container_name: sonic-archivebox
env_file:
@@ -50,5 +35,8 @@ services:
expose:
- 1491
image: archivebox/sonic:latest
networks:
- 1panel-network
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store
+21
View File
@@ -0,0 +1,21 @@
# 数据持久化路径 [必填]
ARCHIVEBOX_ROOT_PATH=/home/archivebox
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=8000
# 管理员用户名 [必填]
ADMIN_USERNAME=archivebox
# 管理员密码 [必填]
ADMIN_PASSWORD=archivebox
# 是否公开快照列表 [必填]
PUBLIC_INDEX=True
# 是否公开快照内容 [必填]
PUBLIC_SNAPSHOTS=True
# 是否允许匿名用户提交存档 [必填]
PUBLIC_ADD_VIEW=False
@@ -0,0 +1,64 @@
networks:
1panel-network:
external: true
services:
archivebox:
container_name: archivebox
depends_on:
- archivebox-init
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- ALLOWED_HOSTS=*
- CSRF_TRUSTED_ORIGINS=http://localhost:8000
- SEARCH_BACKEND_ENGINE=sonic
- SEARCH_BACKEND_HOST_NAME=archivebox-sonic
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
image: archivebox/archivebox:0.8.5rc51
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:8000
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-init:
command: archivebox init
container_name: init-archivebox
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- ALLOWED_HOSTS=*
- CSRF_TRUSTED_ORIGINS=http://localhost:8000
- SEARCH_BACKEND_ENGINE=sonic
- SEARCH_BACKEND_HOST_NAME=archivebox-sonic
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
image: archivebox/archivebox:0.8.5rc51
labels:
createdBy: Apps
networks:
- 1panel-network
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/data:/data
archivebox-sonic:
container_name: sonic-archivebox
env_file:
- ./envs/global.env
- .env
environment:
- TZ=Asia/Shanghai
- SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
expose:
- 1491
image: archivebox/sonic:latest
networks:
- 1panel-network
restart: always
volumes:
- ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store
+19 -1
View File
@@ -1,3 +1,21 @@
# 数据持久化路径 [必填]
AUTO_LADY_ROOT_PATH=/home/byte-muse
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=5000
PANEL_APP_PORT_HTTP=8080
# 自定义挂载目录 1
CUSTOM_MOUNT_DIRECTORY_1=
# 自定义挂载目录 2
CUSTOM_MOUNT_DIRECTORY_2=
# 自定义挂载目录 3
CUSTOM_MOUNT_DIRECTORY_3=
# 网络代理地址
HTTP_PROXY=
# 跳过代理地址
NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local
+15 -3
View File
@@ -2,13 +2,25 @@ networks:
1panel-network:
external: true
services:
byte-muse-license:
auto-lady:
container_name: byte-muse
image: envyafish/byte-muse-license:latest
env_file:
- ./envs/global.env
- .env
environment:
- HTTPS_PROXY=${HTTP_PROXY}
- HTTP_PROXY=${HTTP_PROXY:-}
- NO_PROXY=${NO_PROXY:-}
image: envyafish/byte-muse:1.15.1
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:5000
- ${PANEL_APP_PORT_HTTP}:80
restart: always
volumes:
- ${AUTO_LADY_ROOT_PATH}/config:/data
- ${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}
-21
View File
@@ -1,21 +0,0 @@
# 数据持久化路径 [必填]
AUTO_LADY_ROOT_PATH=/home/byte-muse
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=8080
# 自定义挂载目录 1
CUSTOM_MOUNT_DIRECTORY_1=
# 自定义挂载目录 2
CUSTOM_MOUNT_DIRECTORY_2=
# 自定义挂载目录 3
CUSTOM_MOUNT_DIRECTORY_3=
# 网络代理地址
HTTP_PROXY=
# 跳过代理地址
NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local
+3
View File
@@ -0,0 +1,3 @@
# WebUI 端口 [必填]
PANEL_APP_PORT_HTTP=5000
@@ -0,0 +1,14 @@
networks:
1panel-network:
external: true
services:
byte-muse-license:
container_name: byte-muse
image: envyafish/byte-muse-license:latest
labels:
createdBy: Apps
networks:
- 1panel-network
ports:
- ${PANEL_APP_PORT_HTTP}:5000
restart: always
@@ -0,0 +1,2 @@
# copyright© 2024 XinJiang Ms Studio
ENV_FILE=.env
+2
View File
@@ -0,0 +1,2 @@
# copyright© 2024 XinJiang Ms Studio
TZ=Asia/Shanghai
@@ -15,7 +15,7 @@ services:
- MINIO_BROWSER_REDIRECT=true
extra_hosts:
- ${MINIO_SERVER_HOST:-localhost}:127.0.0.1
image: minio/minio:RELEASE.2025-07-18T21-56-31Z
image: minio/minio:RELEASE.2025-07-23T15-54-02Z
labels:
createdBy: Apps
logging:
+2
View File
@@ -0,0 +1,2 @@
# copyright© 2024 XinJiang Ms Studio
ENV_FILE=.env
+2
View File
@@ -0,0 +1,2 @@
# copyright© 2024 XinJiang Ms Studio
TZ=Asia/Shanghai
+1 -1
View File
@@ -14,7 +14,7 @@ services:
- N8N_PROTOCOL=http
- N8N_DIAGNOSTICS_ENABLED=false
- N8N_SECURE_COOKIE=false
image: n8nio/n8n:1.104.0
image: n8nio/n8n:1.104.1
labels:
createdBy: Apps
networks:
+1 -1
View File
@@ -10,7 +10,7 @@ services:
environment:
- TZ=Asia/Shanghai
- PORT=${PANEL_APP_PORT_HTTP}
image: ghcr.io/nodepassproject/nodepassdash:2.2.0
image: ghcr.io/nodepassproject/nodepassdash:2.2.1
labels:
createdBy: Apps
network_mode: ${NETWORK_MODE}
+1 -1
View File
@@ -57,7 +57,7 @@ services:
- -f
- http://localhost:1200/healthz?key=${ACCESS_KEY}
timeout: 10s
image: diygod/rsshub:2025-07-22
image: diygod/rsshub:2025-07-23
labels:
createdBy: Apps
networks: