From 1e6399c2f0e9e1d671c1379b508007b414329cbf Mon Sep 17 00:00:00 2001 From: cthuang Date: Tue, 6 Oct 2020 15:41:11 +0100 Subject: [PATCH] TUN-3446: Use go 1.15.2 and add a step to build cloudflared in the dev Dockerfile --- Dockerfile | 2 +- dev.Dockerfile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca5716b6..17182daa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # use a builder image for building cloudflare ARG TARGET_GOOS ARG TARGET_GOARCH -FROM golang:1.13.3 as builder +FROM golang:1.15.2 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ TARGET_GOOS=${TARGET_GOOS} \ diff --git a/dev.Dockerfile b/dev.Dockerfile index dcf67365..d2ed788b 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,9 @@ -FROM golang:1.12 as builder +FROM golang:1.15.2 as builder +ENV GO111MODULE=on \ + CGO_ENABLED=0 WORKDIR /go/src/github.com/cloudflare/cloudflared/ RUN apt-get update COPY . . +# compile cloudflared +RUN make cloudflared +RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ \ No newline at end of file