diff --git a/Caddy.Dockerfile b/Caddy.Dockerfile index 4c2ccb651..2065efe97 100644 --- a/Caddy.Dockerfile +++ b/Caddy.Dockerfile @@ -1,4 +1,4 @@ -FROM caddy:2.7.6 as caddy +FROM caddy:2.8.1 as caddy FROM alpine:3.20.0 RUN apk add --no-cache ca-certificates tzdata diff --git a/Dockerfile b/Dockerfile index feaf3381a..e94c237d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN apk upgrade --no-cache -a && \ FROM zoeyvid/nginx-quic:287 SHELL ["/bin/ash", "-eo", "pipefail", "-c"] -ARG CRS_VER=v4.2.0 +ARG CRS_VER=v4.3.0 COPY rootfs / COPY src /app/src diff --git a/rootfs/usr/local/nginx/conf/nginx.conf b/rootfs/usr/local/nginx/conf/nginx.conf index 7a8eb6925..b885d7145 100644 --- a/rootfs/usr/local/nginx/conf/nginx.conf +++ b/rootfs/usr/local/nginx/conf/nginx.conf @@ -57,7 +57,7 @@ http { resolver local=on valid=10s ipv6=on; fastcgi_index index.php; - index index.php index.html; + index index.html index.php; error_page 404 =307 $scheme://$host:$server_port; error_page 497 =301 https://$host:$server_port$request_uri;