From 8d9133124ef693abc926c9abb1383c809567ae87 Mon Sep 17 00:00:00 2001
From: Maik Ellerbrock <opensource@frapsoft.com>
Date: Tue, 4 Jul 2017 18:06:39 +0200
Subject: [PATCH 1/2] fix(catalog): security update for jenkins ci to latest
 version

---
 templates/jenkins-ci/3/docker-compose.yml  | 20 +++++++++++
 templates/jenkins-ci/3/rancher-compose.yml | 42 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 templates/jenkins-ci/3/docker-compose.yml
 create mode 100644 templates/jenkins-ci/3/rancher-compose.yml

diff --git a/templates/jenkins-ci/3/docker-compose.yml b/templates/jenkins-ci/3/docker-compose.yml
new file mode 100644
index 0000000..0f694e9
--- /dev/null
+++ b/templates/jenkins-ci/3/docker-compose.yml
@@ -0,0 +1,20 @@
+jenkins-primary:
+  image: "jenkins:2.60.1"
+  ports:
+    - "${PORT}:8080"
+  labels:
+    io.rancher.sidekicks: jenkins-plugins,jenkins-datavolume
+    io.rancher.container.hostname_override: container_name
+  volumes_from:
+    - jenkins-plugins
+    - jenkins-datavolume
+  entrypoint: /usr/share/jenkins/rancher/jenkins.sh
+jenkins-plugins:
+  image: rancher/jenkins-plugins:v0.1.1
+jenkins-datavolume:
+  image: "busybox"
+  volumes:
+    - ${volume_work}:/var/jenkins_home
+  labels:
+    io.rancher.container.start_once: true
+  entrypoint: ["chown", "-R", "1000:1000", "/var/jenkins_home"]
diff --git a/templates/jenkins-ci/3/rancher-compose.yml b/templates/jenkins-ci/3/rancher-compose.yml
new file mode 100644
index 0000000..b0feb48
--- /dev/null
+++ b/templates/jenkins-ci/3/rancher-compose.yml
@@ -0,0 +1,42 @@
+.catalog:
+  name: Jenkins
+  version: 2.32.2-rancher1
+  description: |
+    Jenkins CI management server.
+  questions:
+  - variable: "PORT"
+    type: "int"
+    label: "Port Number"
+    description: "Which port should Jenkins listen on?"
+    default: 8080
+    required: true
+  - variable: "volume_work"
+    description: "Work volume to save jenkins data"
+    label: "Work volume:"
+    required: true
+    default: "/var/lib/docker/jenkins-ci"
+    type: "string"
+  - variable: "plugins"
+    type: "multiline"
+    label: "List of Plugins"
+    description: |
+      List of plugins in the format <plugin_name>[:<version>]
+      one entry per line.
+    default: |
+      credentials
+      git
+      git-client
+      github
+      github-api
+      github-oauth
+      greenballs
+      junit
+      plain-credentials
+      scm-api
+      ssh-credentials
+      ssh-slaves
+      swarm
+jenkins-primary:
+  metadata:
+    plugins: |
+      ${plugins}

From 6b404ba6837d62da4930e496683e9c4724ee345f Mon Sep 17 00:00:00 2001
From: Maik Ellerbrock <opensource@frapsoft.com>
Date: Tue, 4 Jul 2017 18:13:34 +0200
Subject: [PATCH 2/2] fix(catalog): update version for jenkins fix

---
 templates/jenkins-ci/3/rancher-compose.yml | 2 +-
 templates/jenkins-ci/config.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/jenkins-ci/3/rancher-compose.yml b/templates/jenkins-ci/3/rancher-compose.yml
index b0feb48..ae6b848 100644
--- a/templates/jenkins-ci/3/rancher-compose.yml
+++ b/templates/jenkins-ci/3/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   name: Jenkins
-  version: 2.32.2-rancher1
+  version: 2.60.1-rancher1
   description: |
     Jenkins CI management server.
   questions:
diff --git a/templates/jenkins-ci/config.yml b/templates/jenkins-ci/config.yml
index eb1a9fb..42c8ad3 100644
--- a/templates/jenkins-ci/config.yml
+++ b/templates/jenkins-ci/config.yml
@@ -1,5 +1,5 @@
 name: Jenkins
 description: |
   Jenkins CI server (LTS)
-version: 2.32.2-rancher1
+version: 2.60.1-rancher1
 category: Continuous Integration