From 122fbe3a2b815942fd478b3c1237c554d5b82efb Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 17 Jun 2020 21:20:54 +0200
Subject: [PATCH] switch to compose v2.4

---
 tasks/setup.yml                           | 4 ----
 templates/services/droneci_compose.yml.j2 | 2 +-
 vars/main.yml                             | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 vars/main.yml

diff --git a/tasks/setup.yml b/tasks/setup.yml
index 4540dfc..7520ac0 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -1,8 +1,4 @@
 ---
-- name: Concat lists for proxy setup
-  set_fact:
-    droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy | default([]) }}"
-
 - block:
     - name: Ensure service directory exists
       file:
diff --git a/templates/services/droneci_compose.yml.j2 b/templates/services/droneci_compose.yml.j2
index 60fad1d..a51e79e 100644
--- a/templates/services/droneci_compose.yml.j2
+++ b/templates/services/droneci_compose.yml.j2
@@ -1,6 +1,6 @@
 #jinja2:lstrip_blocks: True
 {{ ansible_managed | comment }}
-version: "2"
+version: "2.4"
 
 services:
   droneci:
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 0b18f80..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-__droneci_default_no_proxy:
-  - droneserver
-  - droneagent