Browse code
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 <github@gone.nl>
Sebastiaan van Stijn authored on 2021/08/23 23:41:32Showing 1 changed files
| ... | ... |
@@ -17,8 +17,8 @@ if [ $# -eq 0 ] || [ "$1" = "archive/tar" ]; then |
| 17 | 17 |
: "${GO_VERSION:=$(awk -F '[ =]' '$1 == "ARG" && $2 == "GO_VERSION" { print $3; exit }' ./Dockerfile)}"
|
| 18 | 18 |
rm -rf vendor/archive |
| 19 | 19 |
mkdir -p ./vendor/archive/tar |
| 20 |
- echo "downloading: https://golang.org/dl/go${GO_VERSION}.src.tar.gz"
|
|
| 21 |
- curl -fsSL "https://golang.org/dl/go${GO_VERSION}.src.tar.gz" \
|
|
| 20 |
+ echo "downloading: https://golang.org/dl/go${GO_VERSION%.0}.src.tar.gz"
|
|
| 21 |
+ curl -fsSL "https://golang.org/dl/go${GO_VERSION%.0}.src.tar.gz" \
|
|
| 22 | 22 |
| tar --extract --gzip --directory=vendor/archive/tar --strip-components=4 go/src/archive/tar |
| 23 | 23 |
patch --strip=4 --directory=vendor/archive/tar --input="$PWD/patches/0001-archive-tar-do-not-populate-user-group-names.patch" |
| 24 | 24 |
fi |