From f9fd3918791a99586d06b08501e967591590766d Mon Sep 17 00:00:00 2001 From: Eric Pfeiffer Date: Fri, 26 Aug 2016 13:25:31 -0500 Subject: [PATCH 1/3] update caddy to v0.9.1 --- caddy/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/caddy/Dockerfile b/caddy/Dockerfile index 9bf05ec7..b195d68d 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.4 MAINTAINER Eric Pfeiffer -LABEL caddy_version="0.9.0" architecture="amd64" +LABEL caddy_version="0.9.1" architecture="amd64" RUN apk update \ && apk upgrade \ @@ -10,7 +10,7 @@ RUN apk update \ RUN curl --silent --show-error --fail --location \ --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/v0.9.1/caddy_linux_amd64.tar.gz" \ | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \ && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \ && chmod 0755 /usr/bin/caddy \ @@ -20,6 +20,4 @@ EXPOSE 80 443 2015 WORKDIR /var/www/laravel/public -ENTRYPOINT ["caddy"] - -CMD ["-conf", "/etc/Caddyfile"] +CMD ["caddy" "-conf", "/etc/Caddyfile"] From 29d714a84912f895237e2dffc9ffcd1ce8d24066 Mon Sep 17 00:00:00 2001 From: Eric Pfeiffer Date: Fri, 26 Aug 2016 13:26:22 -0500 Subject: [PATCH 2/3] caddy log to file. enable gzip compression. --- caddy/Caddyfile | 5 +++-- docker-compose.yml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 5052db32..f3c5434b 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -9,9 +9,10 @@ rewrite { ext / to /index.php?{query} } +gzip browse -log stdout -errors stderr +log /var/log/caddy/access.log +errors /var/log/caddy/error.log # Uncomment to enable TLS (HTTPS) # Change the first list to listen on port 443 when enabling TLS #tls self_signed diff --git a/docker-compose.yml b/docker-compose.yml index 8f8eb326..ecc4fdea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -206,6 +206,7 @@ services: - "2015:2015" volumes: - ./caddy/Caddyfile:/etc/Caddyfile + - ./logs/caddy:/var/log/caddy links: - php-fpm From b25255856015249a7026e6fa353692da9657ed7c Mon Sep 17 00:00:00 2001 From: Eric Pfeiffer Date: Fri, 26 Aug 2016 14:01:48 -0500 Subject: [PATCH 3/3] fix caddy Dockerfile from previous commit. --- caddy/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/caddy/Dockerfile b/caddy/Dockerfile index b195d68d..70559680 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -2,7 +2,9 @@ FROM alpine:3.4 MAINTAINER Eric Pfeiffer -LABEL caddy_version="0.9.1" architecture="amd64" +ENV caddy_version=0.9.1 + +LABEL caddy_version="$caddy_version" architecture="amd64" RUN apk update \ && apk upgrade \ @@ -10,14 +12,13 @@ RUN apk update \ RUN curl --silent --show-error --fail --location \ --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ - "https://github.com/mholt/caddy/releases/download/v0.9.1/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 \ && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \ - && chmod 0755 /usr/bin/caddy \ - && /usr/bin/caddy -version + && chmod 0755 /usr/bin/caddy EXPOSE 80 443 2015 WORKDIR /var/www/laravel/public -CMD ["caddy" "-conf", "/etc/Caddyfile"] +CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]