From d708217503252c8c685e6a019895d1dd3368be9c Mon Sep 17 00:00:00 2001
From: jingyuanliang <jingyuanliang@google.com>
Date: Thu, 16 Nov 2023 21:59:35 -0500
Subject: [PATCH] Bump to golang:1.21-alpine in release.sh

Also make this overridable in env vars.

Signed-off-by: Jingyuan Liang <jingyuanliang@google.com>
---
 .github/workflows/test.yaml | 2 +-
 scripts/release.sh          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 33dcfc0d7..60dc838f3 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ name: test
 on: ["push", "pull_request"]
 
 env:
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.21"
   LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64"
 
 jobs:
diff --git a/scripts/release.sh b/scripts/release.sh
index 2b92d28a8..b8e5659f7 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -3,6 +3,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 DOCKER="${DOCKER:-docker}"
+GOLANG="${GOLANG:-golang:1.21-alpine}"
 
 TAG=$(git describe --tags --dirty)
 RELEASE_DIR=release-${TAG}
@@ -16,7 +17,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${OUTPUT_DIR}
 
-$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.20-alpine \
+$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm "${GOLANG}" \
 /bin/sh -xe -c "\
     apk --no-cache add bash tar;
     cd /go/src/github.com/containernetworking/plugins; umask 0022;