From 2369a767a8c3dc475e8648e726b1037ce0f21c08 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Thu, 14 May 2020 22:57:15 +0300 Subject: [PATCH] remove java7 for ubuntu20 --- images/linux/scripts/installers/java-tools.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 340998d84..7d27d255d 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -16,12 +16,17 @@ DEFAULT_JDK_VERSION=8 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" apt-get -q update -apt-get -y install zulu-7-azure-jdk=\* + +if isUbuntu16 || isUbuntu18 ; then + apt-get -y install zulu-7-azure-jdk=\* + echo "JAVA_HOME_7_X64=/usr/lib/jvm/zulu-7-azure-amd64" | tee -a /etc/environment +fi + apt-get -y install zulu-8-azure-jdk=\* apt-get -y install zulu-11-azure-jdk=\* apt-get -y install zulu-12-azure-jdk=\* update-java-alternatives -s /usr/lib/jvm/zulu-8-azure-amd64 -echo "JAVA_HOME_7_X64=/usr/lib/jvm/zulu-7-azure-amd64" | tee -a /etc/environment + echo "JAVA_HOME_8_X64=/usr/lib/jvm/zulu-8-azure-amd64" | tee -a /etc/environment echo "JAVA_HOME_11_X64=/usr/lib/jvm/zulu-11-azure-amd64" | tee -a /etc/environment echo "JAVA_HOME_12_X64=/usr/lib/jvm/zulu-12-azure-amd64" | tee -a /etc/environment @@ -69,7 +74,9 @@ done # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Azul Zulu OpenJDK:" +if isUbuntu16 || isUbuntu18 ; then DocumentInstalledItemIndent "7 ($(/usr/lib/jvm/zulu-7-azure-amd64/bin/java -showversion |& head -n 1))" +fi DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1)) (default)" DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1))" DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1))"