From e27faa696e337c3bcf1c0d760e2875193e6c6179 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 1 Jun 2022 12:46:04 +0200 Subject: [PATCH] [Ubuntu] Do not add adoptopenjdk ppa to Ubuntu Server 22.04 (#5659) * Do not add adoptopenjdk ppa to Ubuntu Server 22.04 * typo fi --- images/linux/scripts/installers/java-tools.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index b4567d96f..d5ccd1c7c 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -38,9 +38,11 @@ createJavaEnvironmentalVariable() { } enableRepositories() { - # Add Adopt PPA - wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + if isUbuntu18 || isUbuntu20; then + # Add Adopt PPA + wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - + add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + fi # Add Addoptium PPA wget -qO - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add -