From f0b08d766d378f20c5c9f0fe16292a9127a586d5 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward@in4it.io>
Date: Tue, 8 Feb 2022 14:15:18 -0500
Subject: [PATCH] docker demo 3 updates

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

diff --git a/docker-demo-3/scripts/jenkins-init.sh b/docker-demo-3/scripts/jenkins-init.sh
index e6a4f37..22785de 100644
--- a/docker-demo-3/scripts/jenkins-init.sh
+++ b/docker-demo-3/scripts/jenkins-init.sh
@@ -29,8 +29,12 @@ apt-get update
 apt-get install -y default-jre
 
 # install jenkins and docker
-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
+curl -fsSL https://pkg.jenkins.io/debian-stable/jenkins.io.key | sudo tee \
+   /usr/share/keyrings/jenkins-keyring.asc > /dev/null
+echo deb [signed-by=/usr/share/keyrings/jenkins-keyring.asc] \
+ https://pkg.jenkins.io/debian-stable binary/ | sudo tee \
+ /etc/apt/sources.list.d/jenkins.list > /dev/null
+apt-get update
 apt-get install -y jenkins=${JENKINS_VERSION} unzip docker.io
 
 # enable docker and add perms
diff --git a/docker-demo-3/vars.tf b/docker-demo-3/vars.tf
index 1a6489d..cdc768b 100644
--- a/docker-demo-3/vars.tf
+++ b/docker-demo-3/vars.tf
@@ -28,9 +28,9 @@ variable "ECS_AMIS" {
 variable "AMIS" {
   type = map(string)
   default = {
-    us-east-1 = "ami-13be557e"
-    us-west-2 = "ami-06b94666"
-    eu-west-1 = "ami-844e0bf7"
+    us-east-1 = "ami-01b996646377b6619"
+    us-west-2 = "ami-0637e7dc7fcc9a2d9"
+    eu-west-1 = "ami-081ff4b9aa4e81a08"
   }
 }
 
@@ -39,6 +39,6 @@ variable "INSTANCE_DEVICE_NAME" {
 }
 
 variable "JENKINS_VERSION" {
-  default = "2.303.1"
+  default = "2.319.2"
 }