Use Go 1.20

2023-08-19 10:30:16 +02:00 · 2023-08-19 10:30:16 +02:00 · 7cf4c3e811
parent 0e0c286d36
commit 7cf4c3e811
6 changed files with 7 additions and 7 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 # use a builder image for building cloudflare
 ARG TARGET_GOOS
 ARG TARGET_GOARCH
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ENV GO111MODULE=on \
    CGO_ENABLED=0 \
    TARGET_GOOS=${TARGET_GOOS} \
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@ -1,5 +1,5 @@
 # use a builder image for building cloudflare
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ENV GO111MODULE=on \
    CGO_ENABLED=0 
    
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@ -1,5 +1,5 @@
 # use a builder image for building cloudflare
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ENV GO111MODULE=on \
    CGO_ENABLED=0 
    
--- a/cfsetup.yaml
+++ b/cfsetup.yaml
@ -1,5 +1,5 @@
-pinned_go: &pinned_go go=1.19.6-1
-pinned_go_fips: &pinned_go_fips go-boring=1.19.6-1
+pinned_go: &pinned_go go=1.20.7-1
+pinned_go_fips: &pinned_go_fips go-boring=1.20.7-1

 build_dir: &build_dir /cfsetup_build
 default-flavor: bullseye
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@ -1,4 +1,4 @@
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ENV GO111MODULE=on \
    CGO_ENABLED=0
 WORKDIR /go/src/github.com/cloudflare/cloudflared/
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,6 @@
 module github.com/cloudflare/cloudflared

-go 1.19
+go 1.20

 require (
 	github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93