Skip to content

Commit b62df43

Browse files
author
Kelly McEachern
committed
Fix Jenkins install on Amazon AMI. Fix Ubuntu ISO version.
1 parent 67b2a83 commit b62df43

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

packer-templates/application-server.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"variables": {
33
"PACKER_OS_FLAVOUR": "ubuntu",
4-
"PACKER_BOX_NAME": "ubuntu-14.04.4-server-amd64",
4+
"PACKER_BOX_NAME": "ubuntu-14.04.5-server-amd64",
55
"AWS_ACCESS_KEY_ID": "{{env `AWS_ACCESS_KEY_ID`}}",
66
"AWS_SECRET_ACCESS_KEY": "{{env `AWS_SECRET_ACCESS_KEY`}}",
77
"DIGITALOCEAN_API_TOKEN": "{{env `DIGITALOCEAN_API_TOKEN`}}"
@@ -39,7 +39,7 @@
3939
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
4040
"guest_os_type": "Ubuntu_64",
4141
"http_directory": "http",
42-
"iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a",
42+
"iso_checksum": "dde07d37647a1d2d9247e33f14e91acb10445a97578384896b4e1d985f754cc1",
4343
"iso_checksum_type": "sha256",
4444
"iso_url": "http://releases.ubuntu.com/trusty/{{ user `PACKER_BOX_NAME` }}.iso",
4545
"shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now",

packer-templates/control-server.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"variables": {
33
"PACKER_OS_FLAVOUR": "ubuntu",
4-
"PACKER_BOX_NAME": "ubuntu-14.04.4-server-amd64",
4+
"PACKER_BOX_NAME": "ubuntu-14.04.5-server-amd64",
55
"AWS_ACCESS_KEY_ID": "{{env `AWS_ACCESS_KEY_ID`}}",
66
"AWS_SECRET_ACCESS_KEY": "{{env `AWS_SECRET_ACCESS_KEY`}}",
77
"DIGITALOCEAN_API_TOKEN": "{{env `DIGITALOCEAN_API_TOKEN`}}"
@@ -39,7 +39,7 @@
3939
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
4040
"guest_os_type": "Ubuntu_64",
4141
"http_directory": "http",
42-
"iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a",
42+
"iso_checksum": "dde07d37647a1d2d9247e33f14e91acb10445a97578384896b4e1d985f754cc1",
4343
"iso_checksum_type": "sha256",
4444
"iso_url": "http://releases.ubuntu.com/trusty/{{ user `PACKER_BOX_NAME` }}.iso",
4545
"shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now",
@@ -60,8 +60,8 @@
6060
"access_key": "{{ user `AWS_ACCESS_KEY_ID` }}",
6161
"secret_key": "{{ user `AWS_SECRET_ACCESS_KEY` }}",
6262
"region": "us-east-1",
63-
"source_ami": "ami-10b68a78",
64-
"instance_type": "t1.micro",
63+
"source_ami": "ami-772aa961",
64+
"instance_type": "t2.micro",
6565
"ssh_username": "ubuntu",
6666
"ami_name": "control-{{ user `PACKER_BOX_NAME` }}-{{timestamp}}"
6767
},

packer-templates/scripts/jenkins.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/bin/bash -eux
22

33
# JDK and JRE are required for Jenkins
4-
apt-get install -y openjdk-7-jre openjdk-7-jdk unzip dos2unix
4+
add-apt-repository ppa:openjdk-r/ppa
5+
apt-get update
6+
apt-get install openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdk
57

68
wget -q -O - https://jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add -
79
echo deb http://pkg.jenkins-ci.org/debian binary/ > /etc/apt/sources.list.d/jenkins.list

0 commit comments

Comments
 (0)