Skip to content

Commit 53de779

Browse files
committed
TUN-3544: Upgrade to Go 1.15.5
1 parent b7e9146 commit 53de779

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.3 as builder
4+
FROM golang:1.15.5 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.3-1
1+
pinned_go: &pinned_go go=1.15.5-1
22
build_dir: &build_dir /cfsetup_build
33
default-flavor: stretch
44
stretch: &stretch
@@ -250,8 +250,8 @@ centos-7:
250250
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
251251
pre-cache:
252252
- yum install -y fakeroot
253-
- wget https://golang.org/dl/go1.15.3.linux-amd64.tar.gz -P /tmp/
254-
- tar -C /usr/local -xzf /tmp/go1.15.3.linux-amd64.tar.gz
253+
- wget https://golang.org/dl/go1.15.5.linux-amd64.tar.gz -P /tmp/
254+
- tar -C /usr/local -xzf /tmp/go1.15.5.linux-amd64.tar.gz
255255
post-cache:
256256
- export PATH=$PATH:/usr/local/go/bin
257257
- export GOOS=linux
@@ -262,8 +262,8 @@ centos-7:
262262
builddeps: *el7_builddeps
263263
pre-cache:
264264
- yum install -y fakeroot
265-
- wget https://golang.org/dl/go1.15.3.linux-amd64.tar.gz -P /tmp/
266-
- tar -C /usr/local -xzf /tmp/go1.15.3.linux-amd64.tar.gz
265+
- wget https://golang.org/dl/go1.15.5.linux-amd64.tar.gz -P /tmp/
266+
- tar -C /usr/local -xzf /tmp/go1.15.5.linux-amd64.tar.gz
267267
post-cache:
268268
- export PATH=$PATH:/usr/local/go/bin
269269
- 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.3 as builder
1+
FROM golang:1.15.5 as builder
22
ENV GO111MODULE=on \
33
CGO_ENABLED=0
44
WORKDIR /go/src/github.com/cloudflare/cloudflared/

0 commit comments

Comments
 (0)