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

TUN-6282: Upgrade golang to 1.17.10, go-boring to 1.17.9

This commit is contained in:
Igor Postelnik 2022-05-24 19:26:27 -05:00
parent 92f647d45c
commit 7bc2462e36
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfsetup.yaml
View File

@ -1,5 +1,5 @@
pinned_go: &pinned_go go=1.17.5-1 pinned_go: &pinned_go go=1.17.10-1
pinned_go_fips: &pinned_go_fips go-boring=1.17.5-1 pinned_go_fips: &pinned_go_fips go-boring=1.17.9-1
build_dir: &build_dir /cfsetup_build build_dir: &build_dir /cfsetup_build
default-flavor: buster default-flavor: buster
@ -255,8 +255,8 @@ centos-7:
pre-cache: pre-cache:
- yum install -y fakeroot - yum install -y fakeroot
- yum upgrade -y binutils-2.27-44.base.el7.x86_64 - yum upgrade -y binutils-2.27-44.base.el7.x86_64
- wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz -P /tmp/ - wget https://go.dev/dl/go1.17.10.linux-amd64.tar.gz -P /tmp/
- tar -C /usr/local -xzf /tmp/go1.17.5.linux-amd64.tar.gz - tar -C /usr/local -xzf /tmp/go1.17.10.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

4
dev.Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.17.5 as builder FROM golang:1.17.10 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/
@ -6,4 +6,4 @@ RUN apt-get update
COPY . . COPY . .
# compile cloudflared # compile cloudflared
RUN make cloudflared RUN make cloudflared
RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/