From cc5f01d34c89620513ae76c26069b4242c9953e4 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Sun, 23 Oct 2022 23:45:01 +0800 Subject: [PATCH 1/2] HBASE-27441 Use jdk 11.0.16 instead of 11.0.16.1 for branch-2.4 --- dev-support/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index c0e1592549ea..cf599772219d 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -104,8 +104,8 @@ RUN curl --location --fail --silent --show-error --output /tmp/adoptopenjdk8.tar echo "${OPENJDK8_SHA256} */tmp/adoptopenjdk8.tar.gz" | sha256sum -c - FROM BASE_IMAGE AS OPENJDK11_DOWNLOAD_IMAGE -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' +ENV OPENJDK11_URL 'https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16_8.tar.gz' +ENV OPENJDK11_SHA256 '3fa9cb99229ede53d4efddb686106df77794e02b1f4defea6b70b2b53380a8c7' 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 - From 8a2485acb824792d133d4f40697400bb7051e852 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Mon, 24 Oct 2022 00:05:49 +0800 Subject: [PATCH 2/2] fix sha256 --- dev-support/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index cf599772219d..aca12c7ce7a9 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -105,7 +105,7 @@ RUN curl --location --fail --silent --show-error --output /tmp/adoptopenjdk8.tar FROM BASE_IMAGE AS OPENJDK11_DOWNLOAD_IMAGE ENV OPENJDK11_URL 'https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16_8.tar.gz' -ENV OPENJDK11_SHA256 '3fa9cb99229ede53d4efddb686106df77794e02b1f4defea6b70b2b53380a8c7' +ENV OPENJDK11_SHA256 'f79506f80c796d8e6a382f00bd8c528a330c5e29581aaf5cb61e1831742d166f' 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 -