From f826533c59f8b80cd648f7740ac5d00c24c65f1d Mon Sep 17 00:00:00 2001
From: Chris Fordham <chris@fordham-nagy.id.au>
Date: Tue, 25 Jul 2017 21:30:39 +1000
Subject: [PATCH] Employ use of drone version/tag instead of separate images,
 lb as global schedule.

---
 templates/drone/4/docker-compose.yml.tpl |  7 +++----
 templates/drone/4/rancher-compose.yml    | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/templates/drone/4/docker-compose.yml.tpl b/templates/drone/4/docker-compose.yml.tpl
index 14c3d7f..b822ae1 100644
--- a/templates/drone/4/docker-compose.yml.tpl
+++ b/templates/drone/4/docker-compose.yml.tpl
@@ -1,7 +1,7 @@
 version: '2'
 services:
   agent:
-    image: ${drone_agent_image}
+    image: drone/agent:${drone_version}
     environment:
       DRONE_SERVER: ${drone_server}
       DRONE_SECRET: ${drone_secret}
@@ -27,7 +27,7 @@ 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
   server:
-    image: ${drone_server_image}
+    image: drone/drone:${drone_version}
     environment:
       DRONE_HOST: ${drone_host}
       GIN_MODE: ${gin_mode}
@@ -111,7 +111,6 @@ services:
     image: rancher/lb-service-haproxy:v0.6.4
     ports:
       - ${host_port}:${host_port}
-    links:
-      - server:server
     labels:
+      io.rancher.scheduler.global: 'true'
       io.rancher.scheduler.affinity:host_label_soft: drone_lb=true
diff --git a/templates/drone/4/rancher-compose.yml b/templates/drone/4/rancher-compose.yml
index 1c12f52..2f7dc05 100644
--- a/templates/drone/4/rancher-compose.yml
+++ b/templates/drone/4/rancher-compose.yml
@@ -99,16 +99,16 @@ catalog:
       description: "Drone sever identifier. Used by the agent to connect to the server (does not require change)."
       type: string
       default: "drone:9000"
-    - variable: drone_server_image
-      label: Drone Server Image
-      description: "Docker image used for the Drone server container."
-      type: string
-      default: "drone/drone:0.8.0-rc.1"
-    - variable: drone_agent_image
-      label: Drone Agent Image
-      description: "Docker image used for the Drone agent container(s)."
-      type: string
-      default: "drone/agent:0.8.0-rc.1"
+    - variable: drone_version
+      label: Drone Version
+      description: "Drone version/Docker tag used for the Drone container images."
+      type: enum
+      default: "0.8.0-rc.1"
+      options:
+        - 0.8.0-rc.1
+        - 0.8.0
+        - '0.8'
+        - latest
     - variable: database_driver
       label: Database Driver
       description: "Database driver. If sqlite, additional volume would be mounted at /var/lib/drone."
@@ -164,7 +164,6 @@ services:
       healthy_threshold: 2
       response_timeout: 2000
   lb:
-    scale: 1
     start_on_create: true
     lb_config:
       certs: []