curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-4357: Bump Go to 1.16

This commit is contained in:
Adam Chalmers 2021-05-06 12:30:01 -05:00 committed by Areg Harutyunyan
parent 07af2a33b7
commit b87cb9aee8
No known key found for this signature in database
GPG Key ID: 97A3DFFE8E9320B7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,7 +1,7 @@
# use a builder image for building cloudflare # use a builder image for building cloudflare
ARG TARGET_GOOS ARG TARGET_GOOS
ARG TARGET_GOARCH ARG TARGET_GOARCH
FROM golang:1.15.7 as builder FROM golang:1.16.4 as builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
TARGET_GOOS=${TARGET_GOOS} \ TARGET_GOOS=${TARGET_GOOS} \

10
cfsetup.yaml
View File

@ -1,4 +1,4 @@
pinned_go: &pinned_go go=1.15.7-1 pinned_go: &pinned_go go=1.16.4-3
pinned_go_fips: &pinned_go_fips go-fips=1.15.5-3 pinned_go_fips: &pinned_go_fips go-fips=1.15.5-3
build_dir: &build_dir /cfsetup_build build_dir: &build_dir /cfsetup_build
@ -279,8 +279,8 @@ centos-7:
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
pre-cache: pre-cache:
- yum install -y fakeroot - yum install -y fakeroot
- wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz -P /tmp/ - wget https://golang.org/dl/go1.16.4.linux-amd64.tar.gz -P /tmp/
- tar -C /usr/local -xzf /tmp/go1.15.7.linux-amd64.tar.gz - tar -C /usr/local -xzf /tmp/go1.16.4.linux-amd64.tar.gz
post-cache: post-cache:
- export PATH=$PATH:/usr/local/go/bin - export PATH=$PATH:/usr/local/go/bin
- export GOOS=linux - export GOOS=linux
@ -291,8 +291,8 @@ centos-7:
builddeps: *el7_builddeps builddeps: *el7_builddeps
pre-cache: pre-cache:
- yum install -y fakeroot - yum install -y fakeroot
- wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz -P /tmp/ - wget https://golang.org/dl/go1.16.4.linux-amd64.tar.gz -P /tmp/
- tar -C /usr/local -xzf /tmp/go1.15.7.linux-amd64.tar.gz - tar -C /usr/local -xzf /tmp/go1.16.4.linux-amd64.tar.gz
post-cache: post-cache:
- export PATH=$PATH:/usr/local/go/bin - export PATH=$PATH:/usr/local/go/bin
- export GOOS=linux - export GOOS=linux

2
dev.Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.15.7 as builder FROM golang:1.16.4 as builder
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=0 CGO_ENABLED=0
WORKDIR /go/src/github.com/cloudflare/cloudflared/ WORKDIR /go/src/github.com/cloudflare/cloudflared/