From b25255856015249a7026e6fa353692da9657ed7c Mon Sep 17 00:00:00 2001 From: Eric Pfeiffer Date: Fri, 26 Aug 2016 14:01:48 -0500 Subject: [PATCH] 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"]