From c93873ab4400567fb2e585f6d5777fb6f4a4f4a5 Mon Sep 17 00:00:00 2001
From: btp <boristimp@users.noreply.github.com>
Date: Fri, 26 Aug 2016 18:29:46 +0200
Subject: [PATCH] Added SSH Port 8154 (#226)

* Added SSH Port 8154

* Update rancher-compose.yml

* Update docker-compose.yml

* Update rancher-compose.yml
---
 templates/gocd-server/0/docker-compose.yml  | 1 +
 templates/gocd-server/0/rancher-compose.yml | 6 ++++++
 templates/jenkins-ci/1/docker-compose.yml   | 2 +-
 templates/jenkins-ci/1/rancher-compose.yml  | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/templates/gocd-server/0/docker-compose.yml b/templates/gocd-server/0/docker-compose.yml
index 9a2709a..844b1aa 100644
--- a/templates/gocd-server/0/docker-compose.yml
+++ b/templates/gocd-server/0/docker-compose.yml
@@ -10,6 +10,7 @@ gocd-server:
   - SERVER_MAX_MEM=${mem_max}m
   ports:
   - ${public_port}:8153
+  - ${ssh_port}:8154
   labels:
     io.rancher.container.hostname_override: container_name
     io.rancher.sidekicks: gocd-volume
diff --git a/templates/gocd-server/0/rancher-compose.yml b/templates/gocd-server/0/rancher-compose.yml
index a62a6b7..b3c7c90 100644
--- a/templates/gocd-server/0/rancher-compose.yml
+++ b/templates/gocd-server/0/rancher-compose.yml
@@ -13,6 +13,12 @@
       required: true
       default: "8153"
       type: "int"
+    - variable: ssh_port
+      description: "port for remote access of go-agents"
+      label: "SSH Port"
+      required: true
+      default: "8154"
+      type: "int"
     - variable: "mem_initial"
       description: "Initial java memory in Mb"
       label: "Initial memory:"
diff --git a/templates/jenkins-ci/1/docker-compose.yml b/templates/jenkins-ci/1/docker-compose.yml
index 680c54f..a79c1ee 100644
--- a/templates/jenkins-ci/1/docker-compose.yml
+++ b/templates/jenkins-ci/1/docker-compose.yml
@@ -14,7 +14,7 @@ jenkins-plugins:
 jenkins-datavolume:
   image: "busybox"
   volumes:
-    - /var/jenkins_home
+    - ${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/1/rancher-compose.yml b/templates/jenkins-ci/1/rancher-compose.yml
index 1c37a5e..9166a3a 100644
--- a/templates/jenkins-ci/1/rancher-compose.yml
+++ b/templates/jenkins-ci/1/rancher-compose.yml
@@ -10,6 +10,12 @@
     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"