Skip to content

Commit 2d09dc4

Browse files
committed
builder: downgrade patchelf to 0.17.2
Version 0.18 still has this issue: NixOS/patchelf#492 Epic: CRDB-21133 Release note: None
1 parent ffc9e28 commit 2d09dc4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build/.bazelbuilderversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel:20250418-212710
1+
us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel:20250423-215642

build/bazelbuilder/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ RUN case ${TARGETPLATFORM} in \
9292
rm -rf aws awscliv2.zip
9393

9494
RUN case ${TARGETPLATFORM} in \
95-
"linux/amd64") ARCH=x86_64; SHASUM=ce84f2447fb7a8679e58bc54a20dc2b01b37b5802e12c57eece772a6f14bf3f0 ;; \
96-
"linux/arm64") ARCH=aarch64; SHASUM=ae13e2effe077e829be759182396b931d8f85cfb9cfe9d49385516ea367ef7b2 ;; \
95+
"linux/amd64") ARCH=x86_64; SHASUM=a3fb9c1de3512bc91f27cc47297d6d6cf208adee9b64ed719130da59ac13e26b ;; \
96+
"linux/arm64") ARCH=aarch64; SHASUM=e5165eb592a317e1f6da0ac7fcbccf60d7fb8e5ac1f0d7336a9be51c23308b06 ;; \
9797
esac && \
98-
curl -fsSL "https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$ARCH.tar.gz" -o "patchelf.tar.gz" && \
98+
curl -fsSL "https://github.com/NixOS/patchelf/releases/download/0.17.2/patchelf-0.17.2-$ARCH.tar.gz" -o "patchelf.tar.gz" && \
9999
echo "$SHASUM patchelf.tar.gz" | sha256sum -c - && \
100100
tar --strip-components=1 -C /usr -xzf patchelf.tar.gz && \
101101
rm -rf patchelf.tar.gz

build/toolchains/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ platform(
3232
"@platforms//cpu:x86_64",
3333
],
3434
exec_properties = {
35-
"container-image": "docker://us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel@sha256:97228ff5e3ccfed242b49b37fa427d03203bb69ee74c5129f29b6a6fa7662ad1",
35+
"container-image": "docker://us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel@sha256:394483c5651c395cb4d72f4f3551a3c5027ba5c0c278d79c819f7793bdbc5096",
3636
"dockerReuse": "True",
3737
"Pool": "default",
3838
},
@@ -137,7 +137,7 @@ platform(
137137
"@platforms//cpu:arm64",
138138
],
139139
exec_properties = {
140-
"container-image": "docker://us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel@sha256:57c597624ed396b33be80548acfef221e5c340b09ed36a0d826c1798a414b10d",
140+
"container-image": "docker://us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel@sha256:d855a27ab26c92c2a8cdc56bcc22f24cb2b50d6d9742af3c8eb61755f00bcccb",
141141
"dockerReuse": "True",
142142
"Pool": "default",
143143
},

0 commit comments

Comments
 (0)