switch to compose v2.4

2020-06-17 21:20:54 +02:00 · 2020-06-17 21:20:54 +02:00 · 122fbe3a2b
parent 42c799a2dd
commit 122fbe3a2b
3 changed files with 1 additions and 9 deletions
--- 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:
--- 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:
--- a/vars/main.yml
+++ b/vars/main.yml
@ -1,4 +0,0 @@
---
-__droneci_default_no_proxy:
-  - droneserver
-  - droneagent