From 1ffa50ba367fca05e66c4d01e4b786bb2a91094d Mon Sep 17 00:00:00 2001 From: Pierre Verkest Date: Mon, 4 Feb 2019 09:27:49 +0100 Subject: [PATCH 1/2] use proxyprotocol plugin from mastercactapus Works from petrus-v fork were merged --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index da374fa..e8098dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From 8605b359be8d3a952b605a3ebab21b9ef497f42f Mon Sep 17 00:00:00 2001 From: Pierre Verkest Date: Mon, 4 Feb 2019 09:31:44 +0100 Subject: [PATCH 2/2] move to golang 1.11 and alpine 3.8 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8098dc..a676775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Builder # -FROM golang:1.10-alpine as builder +FROM golang:1.11-alpine as builder LABEL maintainer "Pierre Verkest " # 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 @@ -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 " RUN apk add --no-cache openssh-client ca-certificates