Merge pull request #259 from computerfr33k/master

Update caddy server and log to file
This commit is contained in:
Mahmoud Zalt 2016-08-27 08:54:35 +03:00 committed by GitHub
commit 4e0af7e0cb
3 changed files with 10 additions and 9 deletions

View File

@ -9,9 +9,10 @@ rewrite {
ext / ext /
to /index.php?{query} to /index.php?{query}
} }
gzip
browse browse
log stdout log /var/log/caddy/access.log
errors stderr errors /var/log/caddy/error.log
# Uncomment to enable TLS (HTTPS) # Uncomment to enable TLS (HTTPS)
# Change the first list to listen on port 443 when enabling TLS # Change the first list to listen on port 443 when enabling TLS
#tls self_signed #tls self_signed

View File

@ -2,7 +2,9 @@ FROM alpine:3.4
MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com> MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
LABEL caddy_version="0.9.0" architecture="amd64" ENV caddy_version=0.9.1
LABEL caddy_version="$caddy_version" architecture="amd64"
RUN apk update \ RUN apk update \
&& apk upgrade \ && apk upgrade \
@ -10,16 +12,13 @@ RUN apk update \
RUN curl --silent --show-error --fail --location \ RUN curl --silent --show-error --fail --location \
--header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
"https://github.com/mholt/caddy/releases/download/v0.9.0/caddy_linux_amd64.tar.gz" \ "https://github.com/mholt/caddy/releases/download/v$caddy_version/caddy_linux_amd64.tar.gz" \
| tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \ | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
&& mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \ && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
&& chmod 0755 /usr/bin/caddy \ && chmod 0755 /usr/bin/caddy
&& /usr/bin/caddy -version
EXPOSE 80 443 2015 EXPOSE 80 443 2015
WORKDIR /var/www/laravel/public WORKDIR /var/www/laravel/public
ENTRYPOINT ["caddy"] CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]
CMD ["-conf", "/etc/Caddyfile"]

View File

@ -206,6 +206,7 @@ services:
- "2015:2015" - "2015:2015"
volumes: volumes:
- ./caddy/Caddyfile:/etc/Caddyfile - ./caddy/Caddyfile:/etc/Caddyfile
- ./logs/caddy:/var/log/caddy
links: links:
- php-fpm - php-fpm