From 28174f23be0a4423fc25c0f074371bd616291766 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 18 Aug 2016 16:58:08 +0200 Subject: Fix java installation to use default-jdk/jre-headless MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib54270912708da45f07900abf8a0a6d457febc70 Signed-off-by: Jan-Simon Möller --- packer/provision/baseline.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'packer') diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 36783554..769924af 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -109,17 +109,8 @@ EOF # install Java 7 echo "---> Configuring OpenJDK" - apt-get install -qq openjdk-7-jdk > /dev/null + apt-get install -qq default-jre-headless default-jdk-headless > /dev/null - # make jdk8 available - add-apt-repository -y ppa:openjdk-r/ppa > /dev/null - apt-get update -qq > /dev/null - # We need to force openjdk-8-jdk to install - apt-get install -qq openjdk-8-jdk > /dev/null - - # make sure that we still default to openjdk 7 - update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java - update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac } all_systems() { -- cgit 1.2.3-korg