Skip to content

Commit 06872a3

Browse files
committed
Update Dockerfile to work with latest Caddy
1 parent d5e9e5a commit 06872a3

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
FROM golang:1.11-alpine
1+
FROM golang:1.12-alpine
22
MAINTAINER Peter Teich <peter.teich@gmail.com>
33

44
ENV CADDY_VERSION 0.11.1
55

66
RUN set -x \
77
&& apk update && apk add --no-cache --upgrade \
8-
openssl git ca-certificates sed bash busybox \
9-
&& update-ca-certificates \
10-
&& git clone https://github.com/mholt/caddy.git /go/src/github.com/mholt/caddy \
8+
openssl git ca-certificates sed bash busybox
9+
10+
RUN \
11+
git clone https://github.com/mholt/caddy.git /go/src/github.com/mholt/caddy \
12+
# && git checkout tags/v${CADDY_VERSION} \
13+
&& git clone https://github.com/pteich/caddy-tlsconsul.git /go/src/github.com/mholt/caddy/vendor/github.com/pteich/caddy-tlsconsul \
1114
&& cd /go/src/github.com/mholt/caddy \
12-
&& git checkout tags/v${CADDY_VERSION} \
13-
&& go get -d github.com/pteich/caddy-tlsconsul \
14-
&& go get -d github.com/caddyserver/builds
15+
&& go get -d github.com/caddyserver/builds \
16+
&& go get -d github.com/hashicorp/consul/api
1517

1618
RUN sed -e "s#// This is where other plugins get plugged in (imported)#_ \"github.com/pteich/caddy-tlsconsul\"#" -i /go/src/github.com/mholt/caddy/caddy/caddymain/run.go
1719

0 commit comments

Comments
 (0)