This is an automated email from the ASF dual-hosted git repository. slfan1989 pushed a commit to branch branch-3.4 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b793e111d821ded97d5a203d34e3d5102c1e1f0a Author: Istvan Toth <[email protected]> AuthorDate: Wed Mar 26 01:27:25 2025 +0800 HADOOP-19495. Add JDK 24 to Ubuntu 20.04 docker development images. --- dev-support/docker/Dockerfile | 5 +++++ dev-support/docker/Dockerfile_aarch64 | 5 +++++ dev-support/docker/pkg-resolver/packages.json | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 3b71e622a57..6beef860a9b 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -44,9 +44,14 @@ RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \ ###### # hadolint ignore=DL3008,SC2046 RUN apt-get -q update \ + && apt-get -q install -y --no-install-recommends wget apt-transport-https gpg gpg-agent gawk ca-certificates \ && apt-get -q install -y --no-install-recommends python3 \ + && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" > /etc/apt/sources.list.d/adoptium.list \ + && wget -q -O - https://packages.adoptium.net/artifactory/api/gpg/key/public > /etc/apt/trusted.gpg.d/adoptium.asc \ + && apt-get -q update \ && apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal) \ && apt-get clean \ + && update-java-alternatives -s java-1.8.0-openjdk-amd64 \ && rm -rf /var/lib/apt/lists/* RUN locale-gen en_US.UTF-8 diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64 index 26ad10edd6f..b9249f5aec9 100644 --- a/dev-support/docker/Dockerfile_aarch64 +++ b/dev-support/docker/Dockerfile_aarch64 @@ -44,10 +44,15 @@ RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \ ###### # hadolint ignore=DL3008,SC2046 RUN apt-get -q update \ + && apt-get -q install -y --no-install-recommends wget apt-transport-https gpg gpg-agent gawk ca-certificates \ && apt-get -q install -y --no-install-recommends python3 \ && apt-get -q install -y --no-install-recommends phantomjs \ + && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" > /etc/apt/sources.list.d/adoptium.list \ + && wget -q -O - https://packages.adoptium.net/artifactory/api/gpg/key/public > /etc/apt/trusted.gpg.d/adoptium.asc \ + && apt-get -q update \ && apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal::arch64) \ && apt-get clean \ + && update-java-alternatives -s java-1.8.0-openjdk-arm64 \ && rm -rf /var/lib/apt/lists/* RUN locale-gen en_US.UTF-8 diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json index 00d6ba36de2..87ee435703c 100644 --- a/dev-support/docker/pkg-resolver/packages.json +++ b/dev-support/docker/pkg-resolver/packages.json @@ -260,11 +260,13 @@ "java": { "debian:10": "openjdk-11-jdk", "ubuntu:focal": [ + "temurin-24-jdk", "openjdk-8-jdk", "openjdk-11-jdk", "openjdk-17-jdk" ], "ubuntu:focal::arch64": [ + "temurin-24-jdk", "openjdk-8-jdk", "openjdk-11-jdk", "openjdk-17-jdk" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
