Merge pull request #2 from jum/develop

Develop

Author: jum

.github/workflows/build.yaml

@@ -25,7 +25,7 @@ jobs:
         with:
           images: jumager/caddy
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64

build_docker.sh

@@ -6,4 +6,4 @@ 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 .
+docker buildx build --platform linux/arm64,linux/amd64 --build-arg CADDY_VERSION=${CADDY_VERSION} -t ${DOCKER_PREFIX}:${branch} -f Dockerfile --push .

watchtower/docker-compose.yml

@@ -19,6 +19,7 @@ services:
       WATCHTOWER_HTTP_API_UPDATE: "true"
       WATCHTOWER_HTTP_API_TOKEN: "Random_password"
       WATCHTOWER_HTTP_API_PERIODIC_POLLS: "true"
+      WATCHTOWER_LOG_FORMAT: json
 networks:
   default:
     name: caddy