Skip to content

Commit 947a791

Browse files
ahkuibestlong
authored andcommitted
Auto reload caddy and add basicauth example (laradock#1706)
* add live reload and basicauth
1 parent aa84dd8 commit 947a791

5 files changed

Lines changed: 13 additions & 5 deletions

File tree

caddy/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ ARG plugins="cors"
66

77
## ARG plugins="cors cgi cloudflare azure linode"
88

9-
109
RUN caddyplug install ${plugins}
11-
10+
11+
RUN apk add --no-cache inotify-tools \
12+
&& echo -e "#!/bin/sh\nwhile inotifywait -e modify /etc/caddy; do\n\tpkill caddy\ndone " >> /start.sh \
13+
&& chmod +x /start.sh
1214

1315
EXPOSE 80 443 2015
1416

1517
WORKDIR /var/www/public
1618

17-
CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile","-agree"]
19+
CMD ["sh","-c","/start.sh & /usr/bin/caddy -conf /etc/caddy/Caddyfile -agree"]

caddy/Caddyfile renamed to caddy/caddy/Caddyfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,8 @@ laradock2.demo:80 {
4444
#proxy domain.com
4545
#cors
4646
}
47+
48+
laradock3.demo:80 {
49+
import authlist.conf
50+
root /var/www/public
51+
}

caddy/caddy/authlist.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
basicauth / laradock laradock

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ services:
471471
build: ./caddy
472472
volumes:
473473
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
474-
- ${CADDY_CUSTOM_CADDYFILE}:/etc/Caddyfile
474+
- ${CADDY_CONFIG_PATH}:/etc/caddy
475475
- ${CADDY_HOST_LOG_PATH}:/var/log/caddy
476476
- ${DATA_PATH_HOST}:/root/.caddy
477477
ports:

env-example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ MONGODB_PORT=27017
355355
CADDY_HOST_HTTP_PORT=80
356356
CADDY_HOST_HTTPS_PORT=443
357357
CADDY_HOST_LOG_PATH=./logs/caddy
358-
CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile
358+
CADDY_CONFIG_PATH=./caddy/caddy
359359

360360
### LARAVEL ECHO SERVER ###################################
361361

0 commit comments

Comments
 (0)