From 7bc2462e36fe1fc67b15fb120dceebb93da7e5dd Mon Sep 17 00:00:00 2001
From: Igor Postelnik <igor@cloudflare.com>
Date: Tue, 24 May 2022 19:26:27 -0500
Subject: [PATCH] TUN-6282: Upgrade golang to 1.17.10, go-boring to 1.17.9

---
 cfsetup.yaml   | 8 ++++----
 dev.Dockerfile | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cfsetup.yaml b/cfsetup.yaml
index 5342f0a9..3f546135 100644
--- a/cfsetup.yaml
+++ b/cfsetup.yaml
@@ -1,5 +1,5 @@
-pinned_go: &pinned_go go=1.17.5-1
-pinned_go_fips: &pinned_go_fips go-boring=1.17.5-1
+pinned_go: &pinned_go go=1.17.10-1
+pinned_go_fips: &pinned_go_fips go-boring=1.17.9-1
 
 build_dir: &build_dir /cfsetup_build
 default-flavor: buster
@@ -255,8 +255,8 @@ centos-7:
     pre-cache:
       - yum install -y fakeroot
       - 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/
-      - tar -C /usr/local -xzf /tmp/go1.17.5.linux-amd64.tar.gz
+      - wget https://go.dev/dl/go1.17.10.linux-amd64.tar.gz -P /tmp/
+      - tar -C /usr/local -xzf /tmp/go1.17.10.linux-amd64.tar.gz
     post-cache:
       - export PATH=$PATH:/usr/local/go/bin
       - export GOOS=linux
diff --git a/dev.Dockerfile b/dev.Dockerfile
index add922fb..64fdc790 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.5 as builder
+FROM golang:1.17.10 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 WORKDIR /go/src/github.com/cloudflare/cloudflared/
@@ -6,4 +6,4 @@ RUN apt-get update
 COPY . .
 # compile cloudflared
 RUN make cloudflared
-RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
\ No newline at end of file
+RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/