chore(webout): 更新 caddy 镜像标签并整理配置

- 使用 TAG 变量插值 Caddy 与 WebDAV 镜像版本,升级至 2.11.4
- 注释 tp229-out 与 jdy_us-out 服务定义
- 删除已跟踪的 env.cfg
This commit is contained in:
cnphpbb
2026-09-12 16:25:18 +08:00
parent 13d0c35c51
commit e772bfdba0
3 changed files with 29 additions and 24 deletions
-7
View File
@@ -1,7 +0,0 @@
#IMAGE_TAG=hub.tp229.com:3500/caddy:2.8.4
IMAGE_TAG=caddy:2.10.0
BUILD_IMAGE_TAG=caddy:2.10.0-builder
WEBDAV_IMAGE_TAG=cnphpbb/caddy-webdav:2-alpine
TXC_DEPLOY_ROOT=/data/deploy.stack
TXC_VOLUMES_ROOT=/data/volumes
CADDY_CONFIG_ROOT=/data/configs
+4 -4
View File
@@ -9,12 +9,12 @@
# docker compose -p webout --env-file ./env.cfg -f ./stack.yml up -d # docker compose -p webout --env-file ./env.cfg -f ./stack.yml up -d
# #
#IMAGE_TAG=hub.tp229.com:3500/caddy:2.8.4 #IMAGE_TAG=hub.tp229.com:3500/caddy:2.8.4
TAG=2.11.4
IMAGE_TAG=caddy:${TAG}
IMAGE_TAG=caddy:2.10.0 BUILD_IMAGE_TAG=caddy:${TAG}-builder
BUILD_IMAGE_TAG=caddy:2.10.0-builder WEBDAV_IMAGE_TAG=cnphpbb/caddy-webdav:${TAG}-alpine
WEBDAV_IMAGE_TAG=cnphpbb/caddy-webdav:2-alpine
TXC_DEPLOY_ROOT=/data/deploy.stack TXC_DEPLOY_ROOT=/data/deploy.stack
+24 -12
View File
@@ -15,18 +15,30 @@ services:
environment: environment:
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
tp229-out: # tp229-out:
image: ${IMAGE_TAG} # image: ${IMAGE_TAG}
volumes: # volumes:
- caddy_data:/data # - caddy_data:/data
- caddy_config:/config # - caddy_config:/config
- /data/configs/caddy/site-tp229.conf:/etc/caddy/Caddyfile # - /data/configs/caddy/site-tp229.conf:/etc/caddy/Caddyfile
- /data/www-root:/www-root # - /data/www-root:/www-root
- /data/soft:/var/www/soft # - /data/soft:/var/www/soft
container_name: tp229-out # container_name: tp229-out
restart: unless-stopped # restart: unless-stopped
environment: # environment:
- TZ=Asia/Shanghai # - TZ=Asia/Shanghai
# jdy_us-out:
# image: ${IMAGE_TAG}
# volumes:
# - caddy_data:/data
# - caddy_config:/config
# - /data/configs/caddy/jdy-us0-http.conf:/etc/caddy/Caddyfile
# container_name: jdyus-out
# ports:
# - '443:443'
# - '80:80'
# restart: unless-stopped
volumes: volumes:
caddy_data: caddy_data: