Merge pull request #21 from cesc1989/master

Java 8 instructions and Jenkins instructions

Author: cesc1989

README.md

@@ -32,6 +32,7 @@ For:
 Basic software(mostly for Ruby on Rails apps)
 
 - [ImageMagick](https://en.wikipedia.org/wiki/ImageMagick)
+- Java 8
 - [Jenkins](https://jenkins.io)
 - [Let's Encrypt](https://letsencrypt.org/)
 - Library Essentials

dependencies/install_java8.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Java8 doesn't have an official PPA so it needs to be installed from a third party.
+# See Ask Ubuntu about it: https://askubuntu.com/a/944260/167553
+
+# Commands taken from http://www.webupd8.org/2012/09/install-oracle-java-8-in-ubuntu-via-ppa.html
+
+add-apt-repository -y ppa:webupd8team/java
+apt-get update
+apt-get -y install oracle-java8-installer

dependencies/install_jenkins.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-wget -q -O - https://pkg.jenkins.io/debian/jenkins-ci.org.key | sudo apt-key add -
+wget -q -O - https://pkg.jenkins.io/debian/jenkins.io.key | sudo apt-key add -
 sudo sh -c 'echo deb http://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list'
 sudo apt-get update
 sudo apt-get -y install jenkins