Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update aws-cli #108744

Merged
merged 1 commit into from
Aug 15, 2023
Merged

build: update aws-cli #108744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/.bazelbuilderversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cockroachdb/bazel:20230803-060342
cockroachdb/bazel:20230815-141035
2 changes: 1 addition & 1 deletion build/.bazelbuilderversion-fips
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cockroachdb/bazel-fips:20230629-030909
cockroachdb/bazel-fips:20230815-141035
6 changes: 3 additions & 3 deletions build/bazelbuilder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion build/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions build/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down