From 8a020d12e13fc09cf893793c4dcbb32a3ac92dd5 Mon Sep 17 00:00:00 2001 From: Adam Chalmers Date: Thu, 28 Jan 2021 22:37:23 -0600 Subject: [PATCH] TUN-3830: Use Go 1.15.7 --- Dockerfile | 2 +- cfsetup.yaml | 10 +++++----- dev.Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 815f975e..3ac5c7a1 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.15.6 as builder +FROM golang:1.15.7 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ TARGET_GOOS=${TARGET_GOOS} \ diff --git a/cfsetup.yaml b/cfsetup.yaml index f000ade5..14a5546e 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -1,4 +1,4 @@ -pinned_go: &pinned_go go=1.15.6-1 +pinned_go: &pinned_go go=1.15.7-1 build_dir: &build_dir /cfsetup_build default-flavor: buster stretch: &stretch @@ -248,8 +248,8 @@ centos-7: - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm pre-cache: - yum install -y fakeroot - - wget https://golang.org/dl/go1.15.6.linux-amd64.tar.gz -P /tmp/ - - tar -C /usr/local -xzf /tmp/go1.15.6.linux-amd64.tar.gz + - wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz -P /tmp/ + - tar -C /usr/local -xzf /tmp/go1.15.7.linux-amd64.tar.gz post-cache: - export PATH=$PATH:/usr/local/go/bin - export GOOS=linux @@ -260,8 +260,8 @@ centos-7: builddeps: *el7_builddeps pre-cache: - yum install -y fakeroot - - wget https://golang.org/dl/go1.15.6.linux-amd64.tar.gz -P /tmp/ - - tar -C /usr/local -xzf /tmp/go1.15.6.linux-amd64.tar.gz + - wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz -P /tmp/ + - tar -C /usr/local -xzf /tmp/go1.15.7.linux-amd64.tar.gz post-cache: - export PATH=$PATH:/usr/local/go/bin - export GOOS=linux diff --git a/dev.Dockerfile b/dev.Dockerfile index 181c605c..4456f153 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.6 as builder +FROM golang:1.15.7 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 WORKDIR /go/src/github.com/cloudflare/cloudflared/