소스 검색

HADOOP-19495. Add JDK 24 to Ubuntu 20.04 docker development images

Closes #7495

Reviewed-by: Cheng Pan <chengpan@apache.org>
Signed-off-by: Chris Nauroth <cnauroth@apache.org>
Istvan Toth 1 개월 전
부모
커밋
3fd404f2ef
3개의 변경된 파일12개의 추가작업 그리고 0개의 파일을 삭제
  1. 5 0
      dev-support/docker/Dockerfile
  2. 5 0
      dev-support/docker/Dockerfile_aarch64
  3. 2 0
      dev-support/docker/pkg-resolver/packages.json

+ 5 - 0
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

+ 5 - 0
dev-support/docker/Dockerfile_aarch64

@@ -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::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

+ 2 - 0
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"