From 2ce6eeda6dcf651294170a969bf378a10bae7bf8 Mon Sep 17 00:00:00 2001 From: SampsonYe Date: Sat, 11 Oct 2025 22:40:10 +0800 Subject: [PATCH] update alpine version and use caddy v2 --- Dockerfile | 2 +- caddy/Caddyfile | 28 +++++++++++++--------------- entrypoint.sh | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6375c86..0476984 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.22.2 WORKDIR /root diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 0401a5f..9ecf6c5 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -1,18 +1,16 @@ -0.0.0.0:80 { - root /root/ui - timeouts none - gzip - log stdout - errors stdout -} +:80 { + root * /root/ui + file_server + + encode gzip + + log { + output stdout + format console + } -# 代理华相的 API -0.0.0.0:80/v1 { - proxy / 127.0.0.1:8080/v1 { - transparent - websocket + # 代理华相的 API：保持原有 /v1 前缀转发到 127.0.0.1:8080 + handle /v1* { + reverse_proxy 127.0.0.1:8080 } - gzip - log stdout - errors stdout } diff --git a/entrypoint.sh b/entrypoint.sh index 2c442d9..2ef55c1 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/sh -caddy -quic --conf /root/Caddyfile +caddy run --config /root/Caddyfile