From 566b3935e33cffec13cbd4888b03f1cbdf1b4d7f Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Mon, 26 Jan 2026 15:01:33 -0800 Subject: [PATCH] HBASE-29849 create-release do-release-docker.sh only works for x86_64 --- dev-support/create-release/do-release.sh | 3 ++- dev-support/create-release/hbase-rm/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-support/create-release/do-release.sh b/dev-support/create-release/do-release.sh index 6156a217ae34..60201da65a5a 100755 --- a/dev-support/create-release/do-release.sh +++ b/dev-support/create-release/do-release.sh @@ -88,7 +88,8 @@ if [ "$RUNNING_IN_DOCKER" = "1" ]; then export PATH="$JAVA_HOME/bin:$PATH" else # JAVA_HOME for the openjdk package. - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ + arch=`uname -m | sed -e s/aarch64/arm64/ | sed -e s/x86_64/amd64/` + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-${arch}/ fi else # Outside docker, need to ask for information about the release. diff --git a/dev-support/create-release/hbase-rm/Dockerfile b/dev-support/create-release/hbase-rm/Dockerfile index 978e19e85d10..b8446a25dfb4 100644 --- a/dev-support/create-release/hbase-rm/Dockerfile +++ b/dev-support/create-release/hbase-rm/Dockerfile @@ -42,7 +42,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \ patch='2.7.6-*' \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ - && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \ + && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-`uname -m | sed -e s/aarch64/arm64/ | sed -e s/x86_64/amd64/`/jre/bin/java \ && pip3 install --no-cache-dir python-dateutil==2.8.2 SHELL ["/bin/bash", "-o", "pipefail", "-c"]