From 947a791ad2feb8e42f49325d9ca3f06db3451420 Mon Sep 17 00:00:00 2001
From: ahkui <14049597+ahkui@users.noreply.github.com>
Date: Sun, 26 Aug 2018 16:02:55 +0800
Subject: [PATCH] Auto reload caddy and add basicauth example (#1706)

* add live reload and basicauth
---
 caddy/Dockerfile            | 8 +++++---
 caddy/{ => caddy}/Caddyfile | 5 +++++
 caddy/caddy/authlist.conf   | 1 +
 docker-compose.yml          | 2 +-
 env-example                 | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 rename caddy/{ => caddy}/Caddyfile (93%)
 create mode 100644 caddy/caddy/authlist.conf

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 5603e3a1..06dc4901 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -6,12 +6,14 @@ ARG plugins="cors"
 
 ## ARG plugins="cors cgi cloudflare azure linode"
 
-
 RUN caddyplug install ${plugins}
-    
+
+RUN apk add --no-cache inotify-tools \
+    && echo -e "#!/bin/sh\nwhile inotifywait -e modify /etc/caddy; do\n\tpkill caddy\ndone " >> /start.sh \
+    && chmod +x /start.sh
 
 EXPOSE 80 443 2015
 
 WORKDIR /var/www/public
 
-CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile","-agree"]
+CMD ["sh","-c","/start.sh & /usr/bin/caddy -conf /etc/caddy/Caddyfile -agree"]
diff --git a/caddy/Caddyfile b/caddy/caddy/Caddyfile
similarity index 93%
rename from caddy/Caddyfile
rename to caddy/caddy/Caddyfile
index b563fb15..1848d346 100644
--- a/caddy/Caddyfile
+++ b/caddy/caddy/Caddyfile
@@ -44,3 +44,8 @@ laradock2.demo:80 {
     #proxy domain.com
 	#cors
 }
+
+laradock3.demo:80 {
+    import authlist.conf
+    root /var/www/public
+}
\ No newline at end of file
diff --git a/caddy/caddy/authlist.conf b/caddy/caddy/authlist.conf
new file mode 100644
index 00000000..651bf55e
--- /dev/null
+++ b/caddy/caddy/authlist.conf
@@ -0,0 +1 @@
+basicauth / laradock laradock
diff --git a/docker-compose.yml b/docker-compose.yml
index aa7badf1..920f57d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -471,7 +471,7 @@ services:
       build: ./caddy
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
-        - ${CADDY_CUSTOM_CADDYFILE}:/etc/Caddyfile
+        - ${CADDY_CONFIG_PATH}:/etc/caddy
         - ${CADDY_HOST_LOG_PATH}:/var/log/caddy
         - ${DATA_PATH_HOST}:/root/.caddy
       ports:
diff --git a/env-example b/env-example
index 6378c0b6..c851395c 100644
--- a/env-example
+++ b/env-example
@@ -355,7 +355,7 @@ MONGODB_PORT=27017
 CADDY_HOST_HTTP_PORT=80
 CADDY_HOST_HTTPS_PORT=443
 CADDY_HOST_LOG_PATH=./logs/caddy
-CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile
+CADDY_CONFIG_PATH=./caddy/caddy
 
 ### LARAVEL ECHO SERVER ###################################