Auto reload caddy and add basicauth example (#1706)

* add live reload and basicauth
This commit is contained in:
ahkui 2018-08-26 16:02:55 +08:00 committed by Shao Yu-Lung (Allen)
parent aa84dd8616
commit 947a791ad2
5 changed files with 13 additions and 5 deletions

View File

@ -6,12 +6,14 @@ ARG plugins="cors"
## ARG plugins="cors cgi cloudflare azure linode" ## ARG plugins="cors cgi cloudflare azure linode"
RUN caddyplug install ${plugins} 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 EXPOSE 80 443 2015
WORKDIR /var/www/public 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"]

View File

@ -44,3 +44,8 @@ laradock2.demo:80 {
#proxy domain.com #proxy domain.com
#cors #cors
} }
laradock3.demo:80 {
import authlist.conf
root /var/www/public
}

View File

@ -0,0 +1 @@
basicauth / laradock laradock

View File

@ -471,7 +471,7 @@ services:
build: ./caddy build: ./caddy
volumes: volumes:
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER} - ${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 - ${CADDY_HOST_LOG_PATH}:/var/log/caddy
- ${DATA_PATH_HOST}:/root/.caddy - ${DATA_PATH_HOST}:/root/.caddy
ports: ports:

View File

@ -355,7 +355,7 @@ MONGODB_PORT=27017
CADDY_HOST_HTTP_PORT=80 CADDY_HOST_HTTP_PORT=80
CADDY_HOST_HTTPS_PORT=443 CADDY_HOST_HTTPS_PORT=443
CADDY_HOST_LOG_PATH=./logs/caddy CADDY_HOST_LOG_PATH=./logs/caddy
CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile CADDY_CONFIG_PATH=./caddy/caddy
### LARAVEL ECHO SERVER ################################### ### LARAVEL ECHO SERVER ###################################