From c2f3e7a12666f7a0c8ecd33c7b07a394dd58dbd4 Mon Sep 17 00:00:00 2001
From: Chris Fordham <chris@fordham-nagy.id.au>
Date: Fri, 21 Jul 2017 12:51:04 +1000
Subject: [PATCH] Fix missing DRONE_HOST env; expose server ports; fix agent
 image ref; fix drone server address.

---
 templates/drone/4/docker-compose.yml.tpl |  4 ++++
 templates/drone/4/rancher-compose.yml    | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/templates/drone/4/docker-compose.yml.tpl b/templates/drone/4/docker-compose.yml.tpl
index 279192c..831a6fc 100644
--- a/templates/drone/4/docker-compose.yml.tpl
+++ b/templates/drone/4/docker-compose.yml.tpl
@@ -29,6 +29,7 @@ services:
   server:
     image: ${drone_server_image}
     environment:
+      DRONE_HOST: drone
       GIN_MODE: ${gin_mode}
 {{- if (.Values.drone_debug)}}
       DRONE_DEBUG: '${drone_debug}'
@@ -106,6 +107,9 @@ services:
       io.rancher.scheduler.affinity:container_label_soft_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
       io.rancher.container.hostname_override: container_name
 {{- end}}
+    ports:
+     - 9000/tcp
+     - 8000/tcp
   lb:
     image: rancher/load-balancer-service
     ports:
diff --git a/templates/drone/4/rancher-compose.yml b/templates/drone/4/rancher-compose.yml
index b27c195..922a0ea 100644
--- a/templates/drone/4/rancher-compose.yml
+++ b/templates/drone/4/rancher-compose.yml
@@ -66,12 +66,12 @@ catalog:
         - Bitbucket Cloud
         - Bitbucket Server
     - variable: drone_driver_client
-      label: Remote Driver client
+      label: Remote Driver Client
       description: "Client key from remote driver. Required for GitHub, Bitbucket Cloud, Bitbucket Server and GitLab."
       type: string
       required: false
     - variable: drone_driver_secret
-      label: Remote Driver secret
+      label: Remote Driver Secret
       description: "Secret key from remote driver. Required for GitHub, Bitbucket Cloud, Bitbucket Server and GitLab."
       type: multiline
       required: false
@@ -81,12 +81,12 @@ catalog:
       type: string
       required: false
     - variable: drone_driver_user
-      label: Remove Driver Username
+      label: Remote Driver Username
       description: "Remote Driver username. Required for BitBucket Server; see http://docs.drone.io/install-for-bitbucket-server/."
       type: string
       required: false
     - variable: drone_driver_password
-      label: Remove Driver Password
+      label: Remote Driver Password
       description: "Remote Driver password. Required for BitBucket Server, http://docs.drone.io/install-for-bitbucket-server/."
       type: password
       required: false
@@ -94,7 +94,7 @@ catalog:
       label: Drone Server
       description: "Drone sever identifier. Used by the agent to connect to the server (does not require change)."
       type: string
-      default: "ws://drone:8000/ws/broker"
+      default: "drone:9000"
     - variable: drone_server_image
       label: Drone Server Image
       description: "Docker image used for the Drone server container."
@@ -104,7 +104,7 @@ catalog:
       label: Drone Agent Image
       description: "Docker image used for the Drone agent container(s)."
       type: string
-      default: "drone/drone:0.8.0-rc.1"
+      default: "drone/agent:0.8.0-rc.1"
     - variable: database_driver
       label: Database Driver
       description: "Database driver. If sqlite, additional volume would be mounted at /var/lib/drone."