This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new b20bdd2cf20 HBASE-27372 Update java versions in our Dockerfiles (#4784)
b20bdd2cf20 is described below
commit b20bdd2cf20fc9c620c6ddc33e03f8cf4bdc5f0c
Author: Duo Zhang <[email protected]>
AuthorDate: Mon Sep 19 15:43:35 2022 +0800
HBASE-27372 Update java versions in our Dockerfiles (#4784)
Signed-off-by: Xin Sun <[email protected]>
Reviewed-by: SiCheng-Zheng <[email protected]>
(cherry picked from commit 3f5c0a505a5f5cf3fba29fd06e4139584da42956)
---
dev-support/docker/Dockerfile | 23 ++++-------------------
dev-support/hbase_docker/Dockerfile | 4 ++--
2 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index e3369e270dc..c0e1592549e 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -96,23 +96,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output /tmp/maven.tar.gz
"${MAVEN_URL}" && \
echo "${MAVEN_SHA512} */tmp/maven.tar.gz" | sha512sum -c -
-FROM BASE_IMAGE AS OPENJDK7_DOWNLOAD_IMAGE
-ENV OPENJDK7_URL
'https://cdn.azul.com/zulu/bin/zulu7.36.0.5-ca-jdk7.0.252-linux_x64.tar.gz'
-ENV OPENJDK7_SHA256
'e0f34c242e6d456dac3e2c8a9eaeacfa8ea75c4dfc3e8818190bf0326e839d82'
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN curl --location --fail --silent --show-error --output
/tmp/zuluopenjdk7.tar.gz "${OPENJDK7_URL}" && \
- echo "${OPENJDK7_SHA256} */tmp/zuluopenjdk7.tar.gz" | sha256sum -c -
-
FROM BASE_IMAGE AS OPENJDK8_DOWNLOAD_IMAGE
-ENV OPENJDK8_URL
'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz'
-ENV OPENJDK8_SHA256
'e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c'
+ENV OPENJDK8_URL
'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz'
+ENV OPENJDK8_SHA256
'ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58'
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output
/tmp/adoptopenjdk8.tar.gz "${OPENJDK8_URL}" && \
echo "${OPENJDK8_SHA256} */tmp/adoptopenjdk8.tar.gz" | sha256sum -c -
FROM BASE_IMAGE AS OPENJDK11_DOWNLOAD_IMAGE
-ENV OPENJDK11_URL
'https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz'
-ENV OPENJDK11_SHA256
'ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99'
+ENV OPENJDK11_URL
'https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz'
+ENV OPENJDK11_SHA256
'5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2'
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output
/tmp/adoptopenjdk11.tar.gz "${OPENJDK11_URL}" && \
echo "${OPENJDK11_SHA256} */tmp/adoptopenjdk11.tar.gz" | sha256sum -c -
@@ -149,14 +142,6 @@ RUN tar xzf /tmp/maven.tar.gz -C /opt && \
# `dev-support/hbase_docker/Dockerfile` as well.
#
-# hadolint ignore=DL3010
-COPY --from=OPENJDK7_DOWNLOAD_IMAGE /tmp/zuluopenjdk7.tar.gz
/tmp/zuluopenjdk7.tar.gz
-RUN mkdir -p /usr/lib/jvm && \
- tar xzf /tmp/zuluopenjdk7.tar.gz -C /usr/lib/jvm && \
- ln -s "/usr/lib/jvm/$(basename "$(tar -tf /tmp/zuluopenjdk7.tar.gz | head
-n1)")" /usr/lib/jvm/java-7-zuluopenjdk && \
- ln -s /usr/lib/jvm/java-7-zuluopenjdk /usr/lib/jvm/java-7 && \
- rm /tmp/zuluopenjdk7.tar.gz
-
# hadolint ignore=DL3010
COPY --from=OPENJDK8_DOWNLOAD_IMAGE /tmp/adoptopenjdk8.tar.gz
/tmp/adoptopenjdk8.tar.gz
RUN mkdir -p /usr/lib/jvm && \
diff --git a/dev-support/hbase_docker/Dockerfile
b/dev-support/hbase_docker/Dockerfile
index 58d35af4bcf..7aceb46184b 100644
--- a/dev-support/hbase_docker/Dockerfile
+++ b/dev-support/hbase_docker/Dockerfile
@@ -39,8 +39,8 @@ RUN curl --location --fail --silent --show-error --output
/tmp/maven.tar.gz "${M
echo "${MAVEN_SHA512} */tmp/maven.tar.gz" | sha512sum -c -
FROM BASE_IMAGE AS OPENJDK8_DOWNLOAD_IMAGE
-ENV OPENJDK8_URL
'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz'
-ENV OPENJDK8_SHA256
'7b7884f2eb2ba2d47f4c0bf3bb1a2a95b73a3a7734bd47ebf9798483a7bcc423'
+ENV OPENJDK8_URL
'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz'
+ENV OPENJDK8_SHA256
'ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58'
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl --location --fail --silent --show-error --output
/tmp/adoptopenjdk8.tar.gz "${OPENJDK8_URL}" && \
echo "${OPENJDK8_SHA256} */tmp/adoptopenjdk8.tar.gz" | sha256sum -c -
