From 525c4313a02e7263ef22bd121fa8a0d7a6186dce Mon Sep 17 00:00:00 2001 From: zuohuadong Date: Wed, 11 Oct 2017 19:48:07 +0800 Subject: [PATCH] use caddy in Apache-2.0 see: https://caddyserver.com/products/licenses so, I use caddypulg, it is free --- caddy/Dockerfile | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/caddy/Dockerfile b/caddy/Dockerfile index d88fe390..8d8ade00 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -1,22 +1,17 @@ -FROM alpine:3.5 +FROM golang -MAINTAINER Eric Pfeiffer +ARG version="0.10.9" -ENV caddy_version=0.10.5 -ARG plugins=http.git +ARG plugins="git" -LABEL caddy_version="$caddy_version" architecture="amd64" +## If you come frome china, please ues it. -RUN apk update \ - && apk upgrade \ - && apk add --no-cache openssh-client git tar curl +# RUN echo "172.217.6.127 golang.org" >> /etc/hosts -RUN curl --silent --show-error --fail --location \ - --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ - "https://caddyserver.com/download/linux/amd64?plugins=${plugins}" \ - | tar --no-same-owner -C /usr/bin/ -xz caddy \ - && mv /usr/bin/caddy /usr/bin/caddy \ - && chmod 0755 /usr/bin/caddy +RUN go get github.com/abiosoft/caddyplug/caddyplug \ + && caddyplug install-caddy \ + && caddyplug install git +RUN caddy --version EXPOSE 80 443 2015