From 653e77fd228f1ddb6e11ff289cfcc99680d7b111 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 20 Aug 2023 18:27:46 -0400 Subject: [PATCH] bump go to 1.21 (#26608) Co-authored-by: Giteabot --- Dockerfile | 2 +- Dockerfile.rootless | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06481cdf5aa..b42b4daa5fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #Build stage -FROM docker.io/library/golang:1.20-alpine3.18 AS build-env +FROM docker.io/library/golang:1.21-alpine3.18 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} diff --git a/Dockerfile.rootless b/Dockerfile.rootless index aa74d359875..449e630fadb 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,5 +1,5 @@ #Build stage -FROM docker.io/library/golang:1.20-alpine3.18 AS build-env +FROM docker.io/library/golang:1.21-alpine3.18 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} diff --git a/Makefile b/Makefile index 167f56c6b92..1100b9a6215 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ SHASUM ?= shasum -a 256 HAS_GO := $(shell hash $(GO) > /dev/null 2>&1 && echo yes) COMMA := , -XGO_VERSION := go-1.20.x +XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/cosmtrek/air@v1.44.0 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.0