From 6175b234b3e2ae6d3c2577dbe1ee710f7f34f484 Mon Sep 17 00:00:00 2001 From: Ovidiu-Florin BOGDAN Date: Thu, 1 Dec 2016 22:47:01 +0200 Subject: [PATCH 1/3] Copied template from 1.651.3 --- templates/jenkins-ci/2/docker-compose.yml | 20 +++++++++++ templates/jenkins-ci/2/rancher-compose.yml | 42 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 templates/jenkins-ci/2/docker-compose.yml create mode 100644 templates/jenkins-ci/2/rancher-compose.yml diff --git a/templates/jenkins-ci/2/docker-compose.yml b/templates/jenkins-ci/2/docker-compose.yml new file mode 100644 index 0000000..a79c1ee --- /dev/null +++ b/templates/jenkins-ci/2/docker-compose.yml @@ -0,0 +1,20 @@ +jenkins-primary: + image: "jenkins:1.651.3" + 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/2/rancher-compose.yml b/templates/jenkins-ci/2/rancher-compose.yml new file mode 100644 index 0000000..9166a3a --- /dev/null +++ b/templates/jenkins-ci/2/rancher-compose.yml @@ -0,0 +1,42 @@ +.catalog: + name: Jenkins + version: 1.651.3-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 [:] + 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 829938c13946d7a6797d0ef1178664a899cee069 Mon Sep 17 00:00:00 2001 From: Ovidiu-Florin BOGDAN Date: Thu, 1 Dec 2016 22:48:56 +0200 Subject: [PATCH 2/3] Updated Jenkins version to 2.7.1 --- templates/jenkins-ci/2/docker-compose.yml | 2 +- templates/jenkins-ci/2/rancher-compose.yml | 2 +- templates/jenkins-ci/config.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/jenkins-ci/2/docker-compose.yml b/templates/jenkins-ci/2/docker-compose.yml index a79c1ee..ec5eb7d 100644 --- a/templates/jenkins-ci/2/docker-compose.yml +++ b/templates/jenkins-ci/2/docker-compose.yml @@ -1,5 +1,5 @@ jenkins-primary: - image: "jenkins:1.651.3" + image: "jenkins:2.7.1" ports: - "${PORT}:8080" labels: diff --git a/templates/jenkins-ci/2/rancher-compose.yml b/templates/jenkins-ci/2/rancher-compose.yml index 9166a3a..b6af189 100644 --- a/templates/jenkins-ci/2/rancher-compose.yml +++ b/templates/jenkins-ci/2/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: Jenkins - version: 1.651.3-rancher1 + version: 2.7.1-rancher1 description: | Jenkins CI management server. questions: diff --git a/templates/jenkins-ci/config.yml b/templates/jenkins-ci/config.yml index 164ae5e..ed6399a 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: 1.651.3-rancher1 +version: 2.7.1-rancher1 category: Continuous Integration From c62acc916cd90734a1cb308162bc55ab763963ce Mon Sep 17 00:00:00 2001 From: Ovidiu-Florin BOGDAN Date: Thu, 1 Dec 2016 22:54:48 +0200 Subject: [PATCH 3/3] Updated Jenkins to 2.19.4 --- templates/jenkins-ci/2/docker-compose.yml | 2 +- templates/jenkins-ci/2/rancher-compose.yml | 2 +- templates/jenkins-ci/config.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/jenkins-ci/2/docker-compose.yml b/templates/jenkins-ci/2/docker-compose.yml index ec5eb7d..33f5de9 100644 --- a/templates/jenkins-ci/2/docker-compose.yml +++ b/templates/jenkins-ci/2/docker-compose.yml @@ -1,5 +1,5 @@ jenkins-primary: - image: "jenkins:2.7.1" + image: "jenkins:2.19.4" ports: - "${PORT}:8080" labels: diff --git a/templates/jenkins-ci/2/rancher-compose.yml b/templates/jenkins-ci/2/rancher-compose.yml index b6af189..df16cf0 100644 --- a/templates/jenkins-ci/2/rancher-compose.yml +++ b/templates/jenkins-ci/2/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: Jenkins - version: 2.7.1-rancher1 + version: 2.19.4-rancher1 description: | Jenkins CI management server. questions: diff --git a/templates/jenkins-ci/config.yml b/templates/jenkins-ci/config.yml index ed6399a..d840a03 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.7.1-rancher1 +version: 2.19.4-rancher1 category: Continuous Integration