From aa4e3dbb7bfd57fbc1fd949559a4d71720badbad Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward@in4it.io>
Date: Mon, 27 Jan 2020 18:22:06 +0100
Subject: [PATCH] jenkins version bump and script fixes

---
 docker-demo-3/vars.tf                       | 2 +-
 jenkins-packer-demo/scripts/jenkins-init.sh | 2 +-
 jenkins-packer-demo/vars.tf                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-demo-3/vars.tf b/docker-demo-3/vars.tf
index 5c3b42f..6601d00 100644
--- a/docker-demo-3/vars.tf
+++ b/docker-demo-3/vars.tf
@@ -39,6 +39,6 @@ variable "INSTANCE_DEVICE_NAME" {
 }
 
 variable "JENKINS_VERSION" {
-  default = "2.73.2"
+  default = "2.204.1"
 }
 
diff --git a/jenkins-packer-demo/scripts/jenkins-init.sh b/jenkins-packer-demo/scripts/jenkins-init.sh
index d2d5c41..ecec1fe 100644
--- a/jenkins-packer-demo/scripts/jenkins-init.sh
+++ b/jenkins-packer-demo/scripts/jenkins-init.sh
@@ -53,5 +53,5 @@ wget -q https://releases.hashicorp.com/packer/0.10.2/packer_0.10.2_linux_amd64.z
 unzip packer_0.10.2_linux_amd64.zip
 # clean up
 apt-get clean
-rm terraform_0.7.7_linux_amd64.zip
+rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
 rm packer_0.10.2_linux_amd64.zip
diff --git a/jenkins-packer-demo/vars.tf b/jenkins-packer-demo/vars.tf
index 6ccdaaf..8bdbb46 100644
--- a/jenkins-packer-demo/vars.tf
+++ b/jenkins-packer-demo/vars.tf
@@ -24,7 +24,7 @@ variable "INSTANCE_DEVICE_NAME" {
 }
 
 variable "JENKINS_VERSION" {
-  default = "2.121.2"
+  default = "2.204.1"
 }
 
 variable "TERRAFORM_VERSION" {