Merge pull request #1 from jum/develop

Develop

Author: jum

Dockerfile

@@ -1,8 +1,9 @@
 # Dockerfile for building the project with static assets
-FROM --platform=$BUILDPLATFORM golang:1.21-bullseye as build
+FROM --platform=$BUILDPLATFORM golang:1.22-bullseye as build
 
 WORKDIR /goapp
 ARG TARGETOS TARGETARCH
+ARG CADDY_VERSION=latest
 ENV CGO_ENABLED=0
 
 RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -12,7 +13,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 RUN --mount=type=cache,target=/root/.cache/go-build \
 	--mount=type=cache,target=/go/pkg \
 	GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
-	xcaddy build \
+	xcaddy build ${CADDY_VERSION} \
 		--with github.com/pberkel/caddy-storage-redis \
 		--with github.com/caddy-dns/cloudflare \
 		--with github.com/lucaslorentz/caddy-docker-proxy/v2

build_docker.sh

@@ -1,4 +1,9 @@
 #!/bin/sh
 DOCKER_PREFIX=jumager/caddy
 branch=$(basename $(git rev-parse --abbrev-ref HEAD))
-docker buildx build --platform linux/arm64,linux/amd64 -t ${DOCKER_PREFIX}:${branch} -f Dockerfile --push .
+CADDY_VERSION=latest
+if test X$branch = Xdevelop
+then
+    CADDY_VERSION=master
+fi
+docker buildx build --platform linux/arm64,linux/amd64 --build-arg CADDY_VERSION=master -t ${DOCKER_PREFIX}:${branch} -f Dockerfile --push .

caddy/config/Caddyfile

@@ -69,7 +69,7 @@
 	}
 	@forbidden {
                 path /build/* /tests/* /config/* /lib/* /3rdparty/* /templates/* /data/*
-                path /.* /autotest* /occ* /issue* /indie* /db_* /console*
+                path /autotest* /occ* /issue* /indie* /db_* /console*
                 not path /.well-known/*
         }
         error @forbidden 404