diff --git a/webout/env.cfg b/webout/env.cfg deleted file mode 100644 index c5d705e..0000000 --- a/webout/env.cfg +++ /dev/null @@ -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 \ No newline at end of file diff --git a/webout/env.cfg.example b/webout/env.cfg.example index fca7859..f28a16b 100644 --- a/webout/env.cfg.example +++ b/webout/env.cfg.example @@ -9,12 +9,12 @@ # docker compose -p webout --env-file ./env.cfg -f ./stack.yml up -d # #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:2-alpine +WEBDAV_IMAGE_TAG=cnphpbb/caddy-webdav:${TAG}-alpine TXC_DEPLOY_ROOT=/data/deploy.stack diff --git a/webout/webout.yaml b/webout/webout.yaml index 78c0848..75b2340 100644 --- a/webout/webout.yaml +++ b/webout/webout.yaml @@ -15,19 +15,31 @@ services: environment: - TZ=Asia/Shanghai - tp229-out: - image: ${IMAGE_TAG} - volumes: - - caddy_data:/data - - caddy_config:/config - - /data/configs/caddy/site-tp229.conf:/etc/caddy/Caddyfile - - /data/www-root:/www-root - - /data/soft:/var/www/soft - container_name: tp229-out - restart: unless-stopped - environment: - - TZ=Asia/Shanghai + # tp229-out: + # image: ${IMAGE_TAG} + # volumes: + # - caddy_data:/data + # - caddy_config:/config + # - /data/configs/caddy/site-tp229.conf:/etc/caddy/Caddyfile + # - /data/www-root:/www-root + # - /data/soft:/var/www/soft + # container_name: tp229-out + # restart: unless-stopped + # environment: + # - 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: caddy_data: - caddy_config: \ No newline at end of file + caddy_config: