This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new df623d5 Fixes for vagrant installation versus oracle jdk (#3783)
df623d5 is described below
commit df623d5cbe13076e36820f19f20a744713f32c84
Author: Nick Mitchell <[email protected]>
AuthorDate: Tue Jun 19 13:19:09 2018 -0400
Fixes for vagrant installation versus oracle jdk (#3783)
Fixes #3765
---
README.md | 2 +-
tools/ubuntu-setup/java8.sh | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7e8269a..cb047b1 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ wsk action invoke /whisk.system/utils/echo -p message hello
--result
These steps were tested on Mac OS X El Capitan, Ubuntu 14.04.3 LTS and Windows
using Vagrant.
For more information about using OpenWhisk on Vagrant see the
[tools/vagrant/README.md](tools/vagrant/README.md)
-During the Vagrant setup, Open JDK 8 is used as the default Java environment.
If you would like to use Oracle JDK 8, please change the line "su vagrant -c
'source all.sh'" into "su vagrant -c 'source all.sh oracle'" in
tools/vagrant/Vagrantfile.
+During the Vagrant setup, the Oracle JDK 8 is used as the default Java
environment. If you would like to use OpenJDK 8, please change the line "su
vagrant -c 'source all.sh oracle'" into "su vagrant -c 'source all.sh'" in
tools/vagrant/Vagrantfile.
### Native development
diff --git a/tools/ubuntu-setup/java8.sh b/tools/ubuntu-setup/java8.sh
index bda7090..52c2298 100755
--- a/tools/ubuntu-setup/java8.sh
+++ b/tools/ubuntu-setup/java8.sh
@@ -34,5 +34,6 @@ else
sudo add-apt-repository ppa:webupd8team/java -y
sudo apt-get update
+ echo 'oracle-java8-installer shared/accepted-oracle-license-v1-1 boolean
true' | sudo debconf-set-selections
sudo apt-get install oracle-java8-installer -y
fi
