update

add vhosts watch

Author: miniers

Dockerfile

@@ -35,13 +35,13 @@ RUN mkdir -p $GOPATH/src/github.com/miniers/docker-gen  \
 FROM alpine:latest
 MAINTAINER miniers <[email protected]>
 
-ARG S6_OVERLAY_VERSION=v1.21.1.1
+ARG S6_OVERLAY_VERSION=v1.21.2.2
 
 ENV CADDY_OPTIONS ""
 ENV DOCKER_HOST unix:///tmp/docker.sock
 
 # install s6
-RUN apk add --update --no-cache curl tzdata && \
+RUN apk add --update --no-cache curl tzdata inotify-tools && \
     curl -sSL https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz \
     | tar xfz - -C / && \
     cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \

plugins.txt

@@ -6,4 +6,6 @@ _ "github.com/caddyserver/dnsproviders/dnspod"
 _ "github.com/jung-kurt/caddy-cgi"
 _ "github.com/echocat/caddy-filter"
 _ "github.com/hacdias/caddy-webdav"
-_ "github.com/hacdias/filemanager/caddy/filemanager"
+_ "github.com/hacdias/filemanager/caddy/filemanager"
+_ "github.com/linkonoid/caddy-dyndns"
+_ "github.com/caddyserver/dnsproviders/cloudflare"

root/etc/services.d/vhosts-watch/run

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv sh
+
+while inotifywait -e modify,create,delete /root/.caddy/vhosts; do
+    s6-svc -h /var/run/s6/services/caddy
+done

root/usr/bin/reload

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
 
-s6-svc -1 /var/run/s6/services/caddy
+s6-svc -h /var/run/s6/services/caddy