From ba5f41daf0fc47b023ce860c805340ad1c13f45a Mon Sep 17 00:00:00 2001 From: Jackson West Date: Wed, 18 Dec 2024 14:25:55 +0000 Subject: [PATCH] updates buildkit to 0.18.2 and fixes building locally --- builder-base/checksums/buildkit-amd64-checksum | 2 +- builder-base/checksums/buildkit-arm64-checksum | 2 +- builder-base/checksums/go-go1.21-amd64-checksum | 2 +- builder-base/checksums/go-go1.21-arm64-checksum | 2 +- builder-base/checksums/go-go1.22-amd64-checksum | 2 +- builder-base/checksums/go-go1.22-arm64-checksum | 2 +- builder-base/checksums/go-go1.23-amd64-checksum | 2 +- builder-base/checksums/go-go1.23-arm64-checksum | 2 +- builder-base/scripts/download_golang.sh | 2 +- builder-base/scripts/update_shasums.sh | 2 +- builder-base/versions.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builder-base/checksums/buildkit-amd64-checksum b/builder-base/checksums/buildkit-amd64-checksum index 3f0206e38..93e966ff8 100644 --- a/builder-base/checksums/buildkit-amd64-checksum +++ b/builder-base/checksums/buildkit-amd64-checksum @@ -1 +1 @@ -fcd9149b876fba0404365cb021937e2435cad443d2a31b2bc5360298f900dfd7 buildkit-v0.12.5.linux-amd64.tar.gz +5662f23cfa5e475ff50932dd2b71d2c5812928fad631d1e8c9f8f5592a4c1568 buildkit-v0.18.2.linux-amd64.tar.gz diff --git a/builder-base/checksums/buildkit-arm64-checksum b/builder-base/checksums/buildkit-arm64-checksum index 6527653bf..c8e41a02c 100644 --- a/builder-base/checksums/buildkit-arm64-checksum +++ b/builder-base/checksums/buildkit-arm64-checksum @@ -1 +1 @@ -45624b083f88c1b0160aebe9f9589c723900b248ec36bda46b97af2698bbfd1d buildkit-v0.12.5.linux-arm64.tar.gz +de0ae01abc689102de6a765f8f40a30e86203897d3a7b44511a3aa66824bbc48 buildkit-v0.18.2.linux-arm64.tar.gz diff --git a/builder-base/checksums/go-go1.21-amd64-checksum b/builder-base/checksums/go-go1.21-amd64-checksum index b99eaa2b1..a1f445fed 100644 --- a/builder-base/checksums/go-go1.21-amd64-checksum +++ b/builder-base/checksums/go-go1.21-amd64-checksum @@ -1 +1 @@ -502fc16d5910562461e6a6631fb6377de2322aad7304bf2bcd23500ba9dab4a7 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.21.13.linux-amd64.tar.gz +502fc16d5910562461e6a6631fb6377de2322aad7304bf2bcd23500ba9dab4a7 go1.21.13.linux-amd64.tar.gz diff --git a/builder-base/checksums/go-go1.21-arm64-checksum b/builder-base/checksums/go-go1.21-arm64-checksum index d8ace34ae..c325bf7e0 100644 --- a/builder-base/checksums/go-go1.21-arm64-checksum +++ b/builder-base/checksums/go-go1.21-arm64-checksum @@ -1 +1 @@ -2ca2d70dc9c84feef959eb31f2a5aac33eefd8c97fe48f1548886d737bffabd4 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.21.13.linux-arm64.tar.gz +2ca2d70dc9c84feef959eb31f2a5aac33eefd8c97fe48f1548886d737bffabd4 go1.21.13.linux-arm64.tar.gz diff --git a/builder-base/checksums/go-go1.22-amd64-checksum b/builder-base/checksums/go-go1.22-amd64-checksum index b19490636..e15e3825b 100644 --- a/builder-base/checksums/go-go1.22-amd64-checksum +++ b/builder-base/checksums/go-go1.22-amd64-checksum @@ -1 +1 @@ -736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.22.10.linux-amd64.tar.gz +736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092 go1.22.10.linux-amd64.tar.gz diff --git a/builder-base/checksums/go-go1.22-arm64-checksum b/builder-base/checksums/go-go1.22-arm64-checksum index 60799bd0d..0d8d213e9 100644 --- a/builder-base/checksums/go-go1.22-arm64-checksum +++ b/builder-base/checksums/go-go1.22-arm64-checksum @@ -1 +1 @@ -5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.22.10.linux-arm64.tar.gz +5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec go1.22.10.linux-arm64.tar.gz diff --git a/builder-base/checksums/go-go1.23-amd64-checksum b/builder-base/checksums/go-go1.23-amd64-checksum index 5bc6b123f..af86c412a 100644 --- a/builder-base/checksums/go-go1.23-amd64-checksum +++ b/builder-base/checksums/go-go1.23-amd64-checksum @@ -1 +1 @@ -6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.23.4.linux-amd64.tar.gz +6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971 go1.23.4.linux-amd64.tar.gz diff --git a/builder-base/checksums/go-go1.23-arm64-checksum b/builder-base/checksums/go-go1.23-arm64-checksum index d35aeeb23..a1589c30c 100644 --- a/builder-base/checksums/go-go1.23-arm64-checksum +++ b/builder-base/checksums/go-go1.23-arm64-checksum @@ -1 +1 @@ -16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.23.4.linux-arm64.tar.gz +16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e go1.23.4.linux-arm64.tar.gz diff --git a/builder-base/scripts/download_golang.sh b/builder-base/scripts/download_golang.sh index 957ab9adc..eda2d4772 100755 --- a/builder-base/scripts/download_golang.sh +++ b/builder-base/scripts/download_golang.sh @@ -74,7 +74,7 @@ function build::go::download { curl -sSLf --retry 5 "https://go.dev/dl/go$version.${arch/\//-}.tar.gz" -o $filename --create-dirs go_major_version=$(if [[ $(echo "$version" | awk -F'.' '{print NF}') -ge 3 ]]; then echo ${version%.*}; else echo ${version%-*}; fi) - sha256sum -c $SCRIPT_ROOT/../checksums/go-go$go_major_version-${arch##*/}-checksum + (cd $(dirname $filename) && sha256sum -c $SCRIPT_ROOT/../checksums/go-go$go_major_version-${arch##*/}-checksum) fi done } diff --git a/builder-base/scripts/update_shasums.sh b/builder-base/scripts/update_shasums.sh index 9f458d111..9135536c0 100755 --- a/builder-base/scripts/update_shasums.sh +++ b/builder-base/scripts/update_shasums.sh @@ -66,7 +66,7 @@ for TARGETARCH in arm64 amd64; do for v in $go_active_version; do go_major_version=$(if [[ $(echo "$v" | awk -F'.' '{print NF}') -ge 3 ]]; then echo ${v%.*}; else echo ${v%-*}; fi) sha256=$(curl -sSLf --retry 5 "https://go.dev/dl/?mode=json" | jq -r --arg tar "$v.linux-${TARGETARCH/\//-}.tar.gz" '.[].files[] | if .filename == $tar then .sha256 else "" end' | xargs) - echo "$sha256 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/$TARGETARCH/${v}.linux-$TARGETARCH.tar.gz" >"$CHECKSUMS_ROOT/checksums/go-$go_major_version-$TARGETARCH-checksum" + echo "$sha256 ${v}.linux-$TARGETARCH.tar.gz" >"$CHECKSUMS_ROOT/checksums/go-$go_major_version-$TARGETARCH-checksum" done # GOVC diff --git a/builder-base/versions.yaml b/builder-base/versions.yaml index 1619297f3..0e2dce9b6 100644 --- a/builder-base/versions.yaml +++ b/builder-base/versions.yaml @@ -1,6 +1,6 @@ AMAZON_ECR_CRED_HELPER_VERSION: 0.6.0 ANSIBLE_VERSION: 2.15.10 -BUILDKIT_VERSION: v0.12.5 +BUILDKIT_VERSION: v0.18.2 GITHUB_CLI_VERSION: 2.21.1 GOLANG_VERSION_117: 1.17.13-6 GOLANG_VERSION_118: 1.18.10-8