Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Builder
#
FROM golang:1.10-alpine as builder
FROM golang:1.11-alpine as builder
LABEL maintainer "Pierre Verkest <pverkeset@anybox.fr>"
# This dockerfile insall caddy from source and manage plugins we needs
# the image provided by abiosoft contains http.git wich we don't want to use
Expand All @@ -20,8 +20,8 @@ RUN git clone https://github.com/mholt/caddy --depth 1 -b "v${version}" /go/src/
&& git checkout -b "v${version}"

# http.proxyprotocol plugin
RUN go get -v -d github.com/petrus-v/caddy-proxyprotocol \
&& printf "package caddyhttp\nimport _ \"github.com/petrus-v/caddy-proxyprotocol\"" > \
RUN go get -v -d github.com/mastercactapus/caddy-proxyprotocol \
&& printf "package caddyhttp\nimport _ \"github.com/mastercactapus/caddy-proxyprotocol\"" > \
/go/src/github.com/mholt/caddy/caddyhttp/proxyprotocol.go

# builder dependency
Expand All @@ -36,7 +36,7 @@ RUN cd /go/src/github.com/mholt/caddy/caddy \
#
# Final stage
#
FROM alpine:3.7
FROM alpine:3.8
LABEL maintainer "Pierre Verkest <pverkeset@anybox.fr>"

RUN apk add --no-cache openssh-client ca-certificates
Expand Down