From acd03e36e68e9c985840b898dc835976a5fc5fd3 Mon Sep 17 00:00:00 2001 From: Adam Chalmers Date: Thu, 15 Oct 2020 15:55:16 -0500 Subject: [PATCH] TUN-3465: Use Go 1.15.3 --- Dockerfile | 2 +- cfsetup.yaml | 10 +++++----- dev.Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17182daa..dc36bda1 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.2 as builder +FROM golang:1.15.3 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ TARGET_GOOS=${TARGET_GOOS} \ diff --git a/cfsetup.yaml b/cfsetup.yaml index 3e8669fe..037dd3fd 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -1,4 +1,4 @@ -pinned_go: &pinned_go go=1.15.2-1 +pinned_go: &pinned_go go=1.15.3-1 build_dir: &build_dir /cfsetup_build default-flavor: stretch stretch: &stretch @@ -250,8 +250,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.2.linux-amd64.tar.gz -P /tmp/ - - tar -C /usr/local -xzf /tmp/go1.15.2.linux-amd64.tar.gz + - wget https://golang.org/dl/go1.15.3.linux-amd64.tar.gz -P /tmp/ + - tar -C /usr/local -xzf /tmp/go1.15.3.linux-amd64.tar.gz post-cache: - export PATH=$PATH:/usr/local/go/bin - export GOOS=linux @@ -262,8 +262,8 @@ centos-7: builddeps: *el7_builddeps pre-cache: - yum install -y fakeroot - - wget https://golang.org/dl/go1.15.2.linux-amd64.tar.gz -P /tmp/ - - tar -C /usr/local -xzf /tmp/go1.15.2.linux-amd64.tar.gz + - wget https://golang.org/dl/go1.15.3.linux-amd64.tar.gz -P /tmp/ + - tar -C /usr/local -xzf /tmp/go1.15.3.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 d2ed788b..d0969e44 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.2 as builder +FROM golang:1.15.3 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 WORKDIR /go/src/github.com/cloudflare/cloudflared/