Merge branch 'develop' into php

ZoeyVid · May 31, 2024 · ef83fe9 · ef83fe9
2 parents ec5327f + 68768e2
commit ef83fe9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;