Skip to content

Commit 3e4bab9

Browse files
committed
fixed Dockerfile to build with new Caddy versions
1 parent c1c8ac5 commit 3e4bab9

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

Dockerfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ MAINTAINER Peter Teich <peter.teich@gmail.com>
33

44
#ENV CADDY_VERSION 0.11.5
55
ENV GO111MODULE=on
6+
ENV GOPROXY=https://proxy.golang.org
67

78
RUN set -x \
89
&& apk update && apk add --no-cache --upgrade \
9-
openssl git ca-certificates sed bash busybox
10-
11-
RUN \
12-
git clone https://github.com/mholt/caddy.git /src/caddy \
13-
&& cd /src/caddy
14-
15-
RUN sed -e "s#// This is where other plugins get plugged in (imported)#_ \"github.com/pteich/caddy-tlsconsul\"#" -i /src/caddy/caddy/caddymain/run.go
16-
17-
WORKDIR /src/caddy/caddy
18-
RUN go run build.go -goos=linux -goarch=amd64
10+
openssl git ca-certificates
11+
12+
RUN cd / && mkdir caddybuild && cd caddybuild && echo $'package main\n\
13+
import (\n\
14+
"github.com/caddyserver/caddy/caddy/caddymain"\n\
15+
_ "github.com/pteich/caddy-tlsconsul"\n\
16+
)\n\
17+
func main() {\n\
18+
caddymain.Run()\n\
19+
}' > main.go && \
20+
go mod init caddy && go get github.com/caddyserver/caddy && go build
1921

2022
FROM alpine:latest
2123
LABEL maintainer="peter.teich@gmail.com"
@@ -36,7 +38,7 @@ RUN set -x \
3638
&& chmod +x /usr/local/bin/dumb-init \
3739
&& rm -rf /tmp/*
3840

39-
COPY --from=0 /src/caddy/caddy/caddy /bin/caddy
41+
COPY --from=0 /caddybuild/caddy /bin/caddy
4042
RUN chmod +x /bin/caddy
4143

4244
ENTRYPOINT ["/usr/local/bin/dumb-init","/bin/caddy"]

0 commit comments

Comments
 (0)