diff --git a/build/.bazelbuilderversion b/build/.bazelbuilderversion index 8bfba80d243c..2a904ff51306 100644 --- a/build/.bazelbuilderversion +++ b/build/.bazelbuilderversion @@ -1 +1 @@ -cockroachdb/bazel:20230803-060342 \ No newline at end of file +cockroachdb/bazel:20230815-141035 diff --git a/build/.bazelbuilderversion-fips b/build/.bazelbuilderversion-fips index f38425259b08..f1c08f4040e0 100644 --- a/build/.bazelbuilderversion-fips +++ b/build/.bazelbuilderversion-fips @@ -1 +1 @@ -cockroachdb/bazel-fips:20230629-030909 +cockroachdb/bazel-fips:20230815-141035 diff --git a/build/bazelbuilder/Dockerfile b/build/bazelbuilder/Dockerfile index 3859cf052fc0..7f8d44d745f3 100644 --- a/build/bazelbuilder/Dockerfile +++ b/build/bazelbuilder/Dockerfile @@ -93,10 +93,10 @@ RUN apt-get purge -y \ # NB: we don't use apt-get because we need an up to date version of awscli # If you update the below, you should probably also update build/builder/Dockerfile. RUN case ${TARGETPLATFORM} in \ - "linux/amd64") ARCH=x86_64; SHASUM=7ee475f22c1b35cc9e53affbf96a9ffce91706e154a9441d0d39cbf8366b718e ;; \ - "linux/arm64") ARCH=aarch64; SHASUM=624ebb04705d4909eb0d56d467fe6b8b5c53a8c59375ed520e70236120125077 ;; \ + "linux/amd64") ARCH=x86_64; SHASUM=e679933eec90b0e5a75d485be6c2fae0f89a3f9ccdcb1748be69f8f456e9a85f ;; \ + "linux/arm64") ARCH=aarch64; SHASUM=7d6460f795712ebdac7e3c60d4800dde682d136d909810402aac164f2789b860 ;; \ esac && \ - curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-$ARCH-2.0.30.zip" -o "awscliv2.zip" && \ + curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-$ARCH-2.13.9.zip" -o "awscliv2.zip" && \ echo "$SHASUM awscliv2.zip" | sha256sum -c - && \ unzip awscliv2.zip && \ ./aws/install && \ diff --git a/build/builder.sh b/build/builder.sh index 04f529b5680b..f2bc990b314a 100755 --- a/build/builder.sh +++ b/build/builder.sh @@ -3,7 +3,7 @@ set -euo pipefail image=cockroachdb/builder -version=20230629-033334 +version=20230815-142459 function init() { docker build --tag="${image}" "$(dirname "${0}")/builder" diff --git a/build/builder/Dockerfile b/build/builder/Dockerfile index c53c240e07bb..5192006bab83 100644 --- a/build/builder/Dockerfile +++ b/build/builder/Dockerfile @@ -174,8 +174,8 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key ad # awscli - roachtests # NB: we don't use apt-get because we need an up to date version of awscli # If you update the below, you should probably also update build/bazelbuilder/Dockerfile. -RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "awscliv2.zip" && \ - echo "7ee475f22c1b35cc9e53affbf96a9ffce91706e154a9441d0d39cbf8366b718e awscliv2.zip" | sha256sum -c - && \ +RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.13.9.zip" -o "awscliv2.zip" && \ + echo "e679933eec90b0e5a75d485be6c2fae0f89a3f9ccdcb1748be69f8f456e9a85f awscliv2.zip" | sha256sum -c - && \ unzip awscliv2.zip && \ ./aws/install && \ rm -rf aws awscliv2.zip