Merge pull request #396 from LaraDock/appleboy-patch-1

Update caddy version and fix format.
This commit is contained in:
Mahmoud Zalt 2016-10-31 08:05:45 -04:00 committed by GitHub
commit 05f4f371fe

View File

@ -2,7 +2,7 @@ FROM alpine:3.4
MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com> MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
ENV caddy_version=0.9.1 ENV caddy_version=0.9.3
LABEL caddy_version="$caddy_version" architecture="amd64" LABEL caddy_version="$caddy_version" architecture="amd64"
@ -11,11 +11,11 @@ RUN apk update \
&& apk add tar curl && apk add tar curl
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/v$caddy_version/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
EXPOSE 80 443 2015 EXPOSE 80 443 2015