From a22d78a4e4980f6182ee9dc1d347120d264ba3a4 Mon Sep 17 00:00:00 2001 From: Marc Argent Date: Thu, 16 Jun 2016 18:21:47 +0100 Subject: [PATCH] Added custom port option (#187) --- templates/jenkins-ci/0/docker-compose.yml | 2 +- templates/jenkins-ci/0/rancher-compose.yml | 46 ++++++++++++---------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/templates/jenkins-ci/0/docker-compose.yml b/templates/jenkins-ci/0/docker-compose.yml index 1be049f..ae1a189 100644 --- a/templates/jenkins-ci/0/docker-compose.yml +++ b/templates/jenkins-ci/0/docker-compose.yml @@ -1,7 +1,7 @@ jenkins-primary: image: "jenkins:1.642.2" ports: - - "8080:8080" + - "${PORT}:8080" labels: io.rancher.sidekicks: jenkins-plugins,jenkins-datavolume io.rancher.container.hostname_override: container_name diff --git a/templates/jenkins-ci/0/rancher-compose.yml b/templates/jenkins-ci/0/rancher-compose.yml index 6b0c22e..01d7af2 100644 --- a/templates/jenkins-ci/0/rancher-compose.yml +++ b/templates/jenkins-ci/0/rancher-compose.yml @@ -4,26 +4,32 @@ description: | Jenkins CI management server. questions: - - variable: "plugins" - type: "multiline" - label: "List of Plugins" - description: | - List of plugins in the format [:] - one entry per line. - default: | - credentials - greenballs - git - junit - git-client - github-api - github-oauth - github - plain-credentials - scm-api - ssh-credentials - ssh-slaves - swarm + - variable: "PORT" + type: "int" + label: "Port Number" + description: "Which port should Jenkins listen on?" + default: 8080 + required: true + - variable: "plugins" + type: "multiline" + label: "List of Plugins" + description: | + List of plugins in the format [:] + one entry per line. + default: | + credentials + greenballs + git + junit + git-client + github-api + github-oauth + github + plain-credentials + scm-api + ssh-credentials + ssh-slaves + swarm jenkins-primary: metadata: plugins: |