Skip to content

Commit 74ee053

Browse files
committed
builder: install a more recent version of patchelf
The version previously in use produces buggy results on s390x. Epic: CRDB-21133 Release note: None
1 parent 094779f commit 74ee053

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
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:20250409-061148
1+
us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel:20250418-212710

build/bazelbuilder/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN apt-get update \
2424
netbase \
2525
openjdk-8-jre \
2626
openssh-client \
27-
patchelf \
2827
python-is-python3 \
2928
python3 \
3029
python3.8-venv \
@@ -92,6 +91,15 @@ RUN case ${TARGETPLATFORM} in \
9291
./aws/install && \
9392
rm -rf aws awscliv2.zip
9493

94+
RUN case ${TARGETPLATFORM} in \
95+
"linux/amd64") ARCH=x86_64; SHASUM=ce84f2447fb7a8679e58bc54a20dc2b01b37b5802e12c57eece772a6f14bf3f0 ;; \
96+
"linux/arm64") ARCH=aarch64; SHASUM=ae13e2effe077e829be759182396b931d8f85cfb9cfe9d49385516ea367ef7b2 ;; \
97+
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" && \
99+
echo "$SHASUM patchelf.tar.gz" | sha256sum -c - && \
100+
tar --strip-components=1 -C /usr -xzf patchelf.tar.gz && \
101+
rm -rf patchelf.tar.gz
102+
95103
# Install Bazelisk as Bazel.
96104
# NOTE: you should keep this in sync with build/packer/teamcity-agent.sh and
97105
# build/bootstrap/bootstrap-debian.sh -- if an update is necessary here, it's probably

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:dd13f3b97a0baac1dc311cc1d81c39b97071907efb3c6669fa659667a4df5d9b",
35+
"container-image": "docker://us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel@sha256:97228ff5e3ccfed242b49b37fa427d03203bb69ee74c5129f29b6a6fa7662ad1",
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:3c43c89d875fe1d1c05ce40313fad76a928b8dd29af1554e9cb765e9aaaab054",
140+
"container-image": "docker://us-east1-docker.pkg.dev/crl-ci-images/cockroach/bazel@sha256:57c597624ed396b33be80548acfef221e5c340b09ed36a0d826c1798a414b10d",
141141
"dockerReuse": "True",
142142
"Pool": "default",
143143
},

0 commit comments

Comments
 (0)