From 0c45beae8d072042f8734238d6b45b488a62cb22 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward.viaene@gmail.com>
Date: Thu, 26 Jul 2018 19:20:01 +0200
Subject: [PATCH 1/3] output error

---
 jenkins-packer-demo/output.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkins-packer-demo/output.tf b/jenkins-packer-demo/output.tf
index 4c9668a5..1a3f26ef 100644
--- a/jenkins-packer-demo/output.tf
+++ b/jenkins-packer-demo/output.tf
@@ -1,6 +1,6 @@
 output "jenkins-ip" {
-  value = "${aws_instance.jenkins-instance.*.public_ip}"
+  value = ["${aws_instance.jenkins-instance.*.public_ip}"]
 }
 output "app-ip" {
-  value = "${aws_instance.app-instance.*.public_ip}"
+  value = ["${aws_instance.app-instance.*.public_ip}"]
 }

From f29fe4e1dbd05bdf47782612e79db1590d032822 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward.viaene@gmail.com>
Date: Tue, 31 Jul 2018 13:32:39 +0200
Subject: [PATCH 2/3] terraform version bump

---
 docker-demo-3/scripts/jenkins-init.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker-demo-3/scripts/jenkins-init.sh b/docker-demo-3/scripts/jenkins-init.sh
index 5de5f027..88e2b3e0 100644
--- a/docker-demo-3/scripts/jenkins-init.sh
+++ b/docker-demo-3/scripts/jenkins-init.sh
@@ -45,9 +45,11 @@ rm -f get-pip.py
 pip install awscli
 
 # install terraform
-cd /usr/local/bin
-wget -q https://releases.hashicorp.com/terraform/0.7.7/terraform_0.7.7_linux_amd64.zip
-unzip terraform_0.7.7_linux_amd64.zip
+TERRAFORM_VERSION="0.11.7"
+wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
+&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin \
+&& rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+
 # clean up
 apt-get clean
 rm terraform_0.7.7_linux_amd64.zip

From 3307e2c12016c4da3b0e7e09aeb9e2eeb54f35c4 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward.viaene@gmail.com>
Date: Tue, 31 Jul 2018 13:33:32 +0200
Subject: [PATCH 3/3] terraform version bump

---
 jenkins-packer-demo/scripts/jenkins-init.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jenkins-packer-demo/scripts/jenkins-init.sh b/jenkins-packer-demo/scripts/jenkins-init.sh
index da54c2f6..91767f67 100644
--- a/jenkins-packer-demo/scripts/jenkins-init.sh
+++ b/jenkins-packer-demo/scripts/jenkins-init.sh
@@ -39,10 +39,13 @@ rm -f get-pip.py
 pip install awscli
 
 # install terraform
-cd /usr/local/bin
-wget -q https://releases.hashicorp.com/terraform/0.7.7/terraform_0.7.7_linux_amd64.zip
-unzip terraform_0.7.7_linux_amd64.zip
+TERRAFORM_VERSION="0.11.7"
+wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
+&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin \
+&& rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+
 # install packer
+cd /usr/local/bin
 wget -q https://releases.hashicorp.com/packer/0.10.2/packer_0.10.2_linux_amd64.zip
 unzip packer_0.10.2_linux_amd64.zip
 # clean up