updates

jenkins-packer-demo/scripts/install_software.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-apt-get update
-apt-get install -y nginx docker.io vim lvm2

jenkins-packer-demo/scripts/jenkins-init.sh

@@ -9,11 +9,11 @@ if [ "`echo -n $DEVICE_FS`" == "" ] ; then
 	lvcreate --name volume1 -l 100%FREE data
 	mkfs.ext4 /dev/data/volume1
 fi
-mkdir -p /data
-echo '/dev/data/volume1 /data ext4 defaults 0 0' >> /etc/fstab
-mount /data
+mkdir -p /var/lib/jenkins
+echo '/dev/data/volume1 /var/lib/jenkins ext4 defaults 0 0' >> /etc/fstab
+mount /var/lib/jenkins
 
-cd /tmp
-wget http://pkg.jenkins-ci.org/debian-stable/binary/${JENKINS_VERSION}
-dpkg -i ${JENKINS_VERSION}
-rm ${JENKINS_VERSION}
+wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | sudo apt-key add -
+echo "deb http://pkg.jenkins.io/debian-stable binary/" >> /etc/apt/sources.list
+apt-get update
+apt-get install -y jenkins=${JENKINS_VERSION}