From 95cc7115fb0cf8c7a4f556244636f4eed1173ae8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 23 Aug 2021 16:41:32 +0200 Subject: [PATCH] hack/vendor.sh: allow go version to be specified with .0 Golang '.0' releases are released without a trailing .0 (i.e. go1.17 is equal to go1.17.0). For the base image, we want to specify the go version including their patch release (golang:1.17 is equivalent to go1.17.x), so adjust the script to also accept the trailing .0, because otherwise the download-URL is not found: hack/vendor.sh archive/tar update vendored copy of archive/tar downloading: https://golang.org/dl/go1.17.0.src.tar.gz curl: (22) The requested URL returned error: 404 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 9ed88a080122ae478e3c595275bbfd99b024b230) Signed-off-by: Sebastiaan van Stijn --- hack/vendor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 67b9f738c2..696119b258 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -17,8 +17,8 @@ if [ $# -eq 0 ] || [ "$1" = "archive/tar" ]; then : "${GO_VERSION:=$(awk -F '[ =]' '$1 == "ARG" && $2 == "GO_VERSION" { print $3; exit }' ./Dockerfile)}" rm -rf vendor/archive mkdir -p ./vendor/archive/tar - echo "downloading: https://golang.org/dl/go${GO_VERSION}.src.tar.gz" - curl -fsSL "https://golang.org/dl/go${GO_VERSION}.src.tar.gz" \ + echo "downloading: https://golang.org/dl/go${GO_VERSION%.0}.src.tar.gz" + curl -fsSL "https://golang.org/dl/go${GO_VERSION%.0}.src.tar.gz" \ | tar --extract --gzip --directory=vendor/archive/tar --strip-components=4 go/src/archive/tar patch --strip=4 --directory=vendor/archive/tar --input="$PWD/patches/0001-archive-tar-do-not-populate-user-group-names.patch" fi