From c7414a7914590e3ded0c7e4b949946c0f3c6dfbc Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Thu, 28 May 2020 08:56:27 +0800 Subject: [PATCH] =?UTF-8?q?[fix:8u252]=E5=A2=9E=E5=8A=A0CLASSPATH=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 8u252/jdk/Dockerfile | 7 +++++-- 8u252/jre/Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/8u252/jdk/Dockerfile b/8u252/jdk/Dockerfile index 14f0398..a656e1f 100644 --- a/8u252/jdk/Dockerfile +++ b/8u252/jdk/Dockerfile @@ -2,9 +2,11 @@ FROM colovu/ubuntu:18.04 ENV JAVA_VERSION=8u252 \ JAVA_URL_VERSION=8u252b09 \ - JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_" \ LANG=C.UTF-8 \ - JAVA_HOME=/usr/local/openjdk-8 \ + JAVA_HOME=/usr/local/openjdk-8 + +ENV JDK_HOME="${JAVA_HOME}" \ + CLASSPATH="${JAVA_HOME}/lib:${CLASSPATH}" \ PATH="/usr/local/openjdk-8/bin:${PATH}" LABEL \ @@ -37,6 +39,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt install -y --no-install-recommends ${fetchDeps}; \ \ + JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_"; \ curl --progress-bar -L -o openjdk.tgz.asc "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz.sign"; \ curl --progress-bar -L -o openjdk.tgz "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz"; \ \ diff --git a/8u252/jre/Dockerfile b/8u252/jre/Dockerfile index a112b15..5fc0d20 100644 --- a/8u252/jre/Dockerfile +++ b/8u252/jre/Dockerfile @@ -2,9 +2,11 @@ FROM colovu/ubuntu:18.04 ENV JAVA_VERSION=8u252 \ JAVA_URL_VERSION=8u252b09 \ - JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_" \ LANG=C.UTF-8 \ - JAVA_HOME=/usr/local/openjdk-8 \ + JAVA_HOME=/usr/local/openjdk-8 + +ENV JRE_HOME="${JAVA_HOME}/jre" \ + CLASSPATH="${JAVA_HOME}/lib:${JAVA_HOME}/jre/lib:${CLASSPATH}" \ PATH="/usr/local/openjdk-8/bin:/usr/local/openjdk-8/jre/bin:${PATH}" LABEL \ @@ -37,6 +39,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt install -y --no-install-recommends ${fetchDeps}; \ \ + JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_"; \ curl --progress-bar -L -o openjdk.tgz.asc "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz.sign"; \ curl --progress-bar -L -o openjdk.tgz "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz"; \ \