From 7a6cb9697dde62d6bdb2c9aa7bfc7d82daf6fdd4 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sat, 4 Jan 2020 15:39:35 +0100
Subject: [PATCH] Fixed runner not connecting with server

---
 .../drone/templates/etc/drone/docker-compose.yml.j2 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/roles/drone/templates/etc/drone/docker-compose.yml.j2 b/roles/drone/templates/etc/drone/docker-compose.yml.j2
index c1c9a13..3cea730 100644
--- a/roles/drone/templates/etc/drone/docker-compose.yml.j2
+++ b/roles/drone/templates/etc/drone/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   drone-server:
-    image: drone/drone:1
+    image: drone/drone:latest
 
     ports:
       - "8000:80"
@@ -14,6 +14,7 @@ services:
     environment:
       - DRONE_SERVER_HOST={{ ci_domain }}
       - DRONE_SERVER_PROTO=https
+      - DRONE_AGENTS_ENABLED=true
       - DRONE_RPC_SECRET={{ drone_rpc_secret }}
       - DRONE_USER_CREATE=username:{{ gitea_user }},admin:true
       - DRONE_GITEA_SERVER={{ gitea_url }}
@@ -22,16 +23,18 @@ services:
       - LC_ALL=C.UTF-8
       - LANG=C.UTF-8
   drone-runner:
-    image: drone/drone-runner-docker:1
+    image: drone/drone-runner-docker:latest
 
     ports:
       - "3000:3000"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     restart: always
+    depends_on:
+      drone-server
     environment:
-      - DRONE_RPC_PROTO=https
-      - DRONE_RPC_HOST={{ ci_domain }}
+      - DRONE_RPC_PROTO=http
+      - DRONE_RPC_HOST=drone-server
       - DRONE_RPC_SECRET={{ drone_rpc_secret }}
       - DRONE_RUNNER_CAPACITY=2
-      - DRONE_RUNNER_NAME=${HOSTNAME}
+      - DRONE_RUNNER_NAME={{ ansible_hostname }}