mirror of
https://github.com/QYG2297248353/appstore-1panel.git
synced 2026-06-16 01:02:14 +08:00
Merge remote-tracking branch 'origin/custom' into custom
This commit is contained in:
+1
-1
@@ -11,7 +11,7 @@ services:
|
|||||||
- HTTPS_PROXY=${HTTP_PROXY}
|
- HTTPS_PROXY=${HTTP_PROXY}
|
||||||
- HTTP_PROXY=${HTTP_PROXY:-}
|
- HTTP_PROXY=${HTTP_PROXY:-}
|
||||||
- NO_PROXY=${NO_PROXY:-}
|
- NO_PROXY=${NO_PROXY:-}
|
||||||
image: envyafish/byte-muse:1.14.13
|
image: envyafish/byte-muse:1.14.15
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
+1
-1
@@ -14,7 +14,7 @@ services:
|
|||||||
- verificationCodeTimeout=10
|
- verificationCodeTimeout=10
|
||||||
- appname=casdoor
|
- appname=casdoor
|
||||||
- authState=casdoor
|
- authState=casdoor
|
||||||
image: casbin/casdoor:v1.975.0
|
image: casbin/casdoor:v1.976.0
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
+1
-1
@@ -11,7 +11,7 @@ services:
|
|||||||
- PUID=0
|
- PUID=0
|
||||||
- PGID=0
|
- PGID=0
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
image: ghostchu/peerbanhelper:v8.0.6
|
image: ghostchu/peerbanhelper:v8.0.7
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
@@ -12,7 +12,7 @@ services:
|
|||||||
- USER_PASSWORD_REQUIREMENTS=15
|
- USER_PASSWORD_REQUIREMENTS=15
|
||||||
- IMAGE_MAX_SIZE=15M
|
- IMAGE_MAX_SIZE=15M
|
||||||
- STORAGE_PROVIDER=local
|
- STORAGE_PROVIDER=local
|
||||||
image: anirdev/slink:v1.6.1
|
image: anirdev/slink:v1.6.2
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
+1
-19
@@ -1,21 +1,3 @@
|
|||||||
# 数据持久化路径 [必填]
|
|
||||||
AUTO_LADY_ROOT_PATH=/home/byte-muse
|
|
||||||
|
|
||||||
# WebUI 端口 [必填]
|
# WebUI 端口 [必填]
|
||||||
PANEL_APP_PORT_HTTP=8080
|
PANEL_APP_PORT_HTTP=5000
|
||||||
|
|
||||||
# 自定义挂载目录 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
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,25 +2,13 @@ networks:
|
|||||||
1panel-network:
|
1panel-network:
|
||||||
external: true
|
external: true
|
||||||
services:
|
services:
|
||||||
auto-lady:
|
byte-muse-license:
|
||||||
container_name: byte-muse
|
container_name: byte-muse
|
||||||
env_file:
|
image: envyafish/byte-muse-license:latest
|
||||||
- ./envs/global.env
|
|
||||||
- .env
|
|
||||||
environment:
|
|
||||||
- HTTPS_PROXY=${HTTP_PROXY}
|
|
||||||
- HTTP_PROXY=${HTTP_PROXY:-}
|
|
||||||
- NO_PROXY=${NO_PROXY:-}
|
|
||||||
image: envyafish/byte-muse:1.14.13
|
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
- 1panel-network
|
- 1panel-network
|
||||||
ports:
|
ports:
|
||||||
- ${PANEL_APP_PORT_HTTP}:80
|
- ${PANEL_APP_PORT_HTTP}:5000
|
||||||
restart: always
|
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}
|
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# 数据持久化路径 [必填]
|
||||||
|
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
|
||||||
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
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.14.15
|
||||||
|
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}
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# WebUI 端口 [必填]
|
|
||||||
PANEL_APP_PORT_HTTP=5000
|
|
||||||
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
- verificationCodeTimeout=10
|
- verificationCodeTimeout=10
|
||||||
- appname=casdoor
|
- appname=casdoor
|
||||||
- authState=casdoor
|
- authState=casdoor
|
||||||
image: casbin/casdoor:v1.975.0
|
image: casbin/casdoor:v1.976.0
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ services:
|
|||||||
- PUID=0
|
- PUID=0
|
||||||
- PGID=0
|
- PGID=0
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
image: ghostchu/peerbanhelper:v8.0.6
|
image: ghostchu/peerbanhelper:v8.0.7
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ services:
|
|||||||
- USER_PASSWORD_REQUIREMENTS=15
|
- USER_PASSWORD_REQUIREMENTS=15
|
||||||
- IMAGE_MAX_SIZE=15M
|
- IMAGE_MAX_SIZE=15M
|
||||||
- STORAGE_PROVIDER=local
|
- STORAGE_PROVIDER=local
|
||||||
image: anirdev/slink:v1.6.1
|
image: anirdev/slink:v1.6.2
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
Reference in New Issue
Block a user