aboutsummaryrefslogtreecommitdiffstats
path: root/packer
diff options
context:
space:
mode:
authorJan-Simon Möller <dl9pf@gmx.de>2016-08-18 16:58:08 +0200
committerJan-Simon Möller <dl9pf@gmx.de>2016-08-18 16:58:22 +0200
commit28174f23be0a4423fc25c0f074371bd616291766 (patch)
tree75c362b518e9b35a19b692539aff21bf43e8ebb3 /packer
parent72b5171b30b064008a76f08127920a2c593192f5 (diff)
Fix java installation to use default-jdk/jre-headless
Change-Id: Ib54270912708da45f07900abf8a0a6d457febc70 Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
Diffstat (limited to 'packer')
-rw-r--r--packer/provision/baseline.sh11
1 files changed, 1 insertions, 10 deletions
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() {