Skip to content

Commit 7bc2462

Browse files
committed
TUN-6282: Upgrade golang to 1.17.10, go-boring to 1.17.9
1 parent 92f647d commit 7bc2462

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cfsetup.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pinned_go: &pinned_go go=1.17.5-1
2-
pinned_go_fips: &pinned_go_fips go-boring=1.17.5-1
1+
pinned_go: &pinned_go go=1.17.10-1
2+
pinned_go_fips: &pinned_go_fips go-boring=1.17.9-1
33

44
build_dir: &build_dir /cfsetup_build
55
default-flavor: buster
@@ -255,8 +255,8 @@ centos-7:
255255
pre-cache:
256256
- yum install -y fakeroot
257257
- yum upgrade -y binutils-2.27-44.base.el7.x86_64
258-
- wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz -P /tmp/
259-
- tar -C /usr/local -xzf /tmp/go1.17.5.linux-amd64.tar.gz
258+
- wget https://go.dev/dl/go1.17.10.linux-amd64.tar.gz -P /tmp/
259+
- tar -C /usr/local -xzf /tmp/go1.17.10.linux-amd64.tar.gz
260260
post-cache:
261261
- export PATH=$PATH:/usr/local/go/bin
262262
- export GOOS=linux

dev.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.17.5 as builder
1+
FROM golang:1.17.10 as builder
22
ENV GO111MODULE=on \
33
CGO_ENABLED=0
44
WORKDIR /go/src/github.com/cloudflare/cloudflared/
55
RUN apt-get update
66
COPY . .
77
# compile cloudflared
88
RUN make cloudflared
9-
RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
9+
RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/

0 commit comments

Comments
 (0)