Skip to content

Commit b87cb9a

Browse files
adamchalmerssssilver
authored andcommitted
TUN-4357: Bump Go to 1.16
1 parent 07af2a3 commit b87cb9a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# use a builder image for building cloudflare
22
ARG TARGET_GOOS
33
ARG TARGET_GOARCH
4-
FROM golang:1.15.7 as builder
4+
FROM golang:1.16.4 as builder
55
ENV GO111MODULE=on \
66
CGO_ENABLED=0 \
77
TARGET_GOOS=${TARGET_GOOS} \

cfsetup.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pinned_go: &pinned_go go=1.15.7-1
1+
pinned_go: &pinned_go go=1.16.4-3
22
pinned_go_fips: &pinned_go_fips go-fips=1.15.5-3
33

44
build_dir: &build_dir /cfsetup_build
@@ -279,8 +279,8 @@ centos-7:
279279
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
280280
pre-cache:
281281
- yum install -y fakeroot
282-
- wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz -P /tmp/
283-
- tar -C /usr/local -xzf /tmp/go1.15.7.linux-amd64.tar.gz
282+
- wget https://golang.org/dl/go1.16.4.linux-amd64.tar.gz -P /tmp/
283+
- tar -C /usr/local -xzf /tmp/go1.16.4.linux-amd64.tar.gz
284284
post-cache:
285285
- export PATH=$PATH:/usr/local/go/bin
286286
- export GOOS=linux
@@ -291,8 +291,8 @@ centos-7:
291291
builddeps: *el7_builddeps
292292
pre-cache:
293293
- yum install -y fakeroot
294-
- wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz -P /tmp/
295-
- tar -C /usr/local -xzf /tmp/go1.15.7.linux-amd64.tar.gz
294+
- wget https://golang.org/dl/go1.16.4.linux-amd64.tar.gz -P /tmp/
295+
- tar -C /usr/local -xzf /tmp/go1.16.4.linux-amd64.tar.gz
296296
post-cache:
297297
- export PATH=$PATH:/usr/local/go/bin
298298
- export GOOS=linux

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.15.7 as builder
1+
FROM golang:1.16.4 as builder
22
ENV GO111MODULE=on \
33
CGO_ENABLED=0
44
WORKDIR /go/src/github.com/cloudflare/cloudflared/

0 commit comments

Comments
 (0)