Merge remote-tracking branch 'upstream/master' into xia-master

DOCUMENTATION/content/guides/index.md

@@ -69,6 +69,14 @@ Note that more containers are available, find them in the [docs](http://laradock
 docker-compose exec workspace bash
 ```
 
+## Execute commands
+
+If you want to only execute some command and don't want to enter bash, you can execute `docker-compose run workspace <command>`.
+
+```
+docker-compose run workspace php artisan migrate
+```
+
 ## Install and configure Laravel
 
 Let's install Laravel's dependencies, add the `.env` file, generate the key and give proper permissions to the cache folder.

caddy/Dockerfile

@@ -1,30 +1,5 @@
-FROM golang:alpine
+FROM abiosoft/caddy:no-stats
 
-LABEL maintainer="Huadong Zuo <admin@zuohuadong.cn>"
+CMD ["--conf", "/etc/caddy/Caddyfile", "--log", "stdout", "--agree=true"]
 
-RUN apk add --no-cache \
-    openssh \
-    git \
-    build-base \
-    && mkdir -p $GOPATH/src/golang.org/x/ \
-    && cd $GOPATH/src/golang.org/x/ \
-    && git clone https://github.com/golang/sys.git sys \
-    && go get github.com/abiosoft/caddyplug/caddyplug \
-    && caddyplug install-caddy \
-    apk del build-base
-
-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
-
-WORKDIR /var/www/public
-
-CMD ["sh","-c","/start.sh & /usr/bin/caddy -conf /etc/caddy/Caddyfile -agree"]
+EXPOSE 80 443 2015