From 01ea1cf575c05208763b6141de2e3533cb8c6b36 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Tue, 16 Jun 2020 00:02:40 +0200
Subject: [PATCH] Revert "fix compose v3 syntax"

This reverts commit fb715e3459bf8e7d253204e818baedff6d67fa21.
---
 defaults/main.yml                         | 14 ++++----------
 templates/services/droneci_compose.yml.j2 |  8 +++++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d1432f2..d80134a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -48,16 +48,10 @@ droneci_networks:
 droneci_networks_applied:
   - droneci
 
-# @var droneci_docker_resources: $ "_unset_"
-# @var droneci_docker_resources:example: >
-# droneci_docker_resources:
-#   limits:
-#     cpus: "0.50"
-#     memory: 50M
-#   reservations:
-#     cpus: "0.25"
-#     memory: 20M
-# @end
+# @var droneci_memory_limit: $ "_unset_"
+# @var droneci_memory_limit:example: $ "512m"
+# @var droneci_memory_reservation: $ "_unset_"
+# @var droneci_memory_reservation:example: $ "256m"
 
 droneci_db_type: sqlite
 droneci_db_server: localhost
diff --git a/templates/services/droneci_compose.yml.j2 b/templates/services/droneci_compose.yml.j2
index 9947965..f12d06a 100644
--- a/templates/services/droneci_compose.yml.j2
+++ b/templates/services/droneci_compose.yml.j2
@@ -62,9 +62,11 @@ services:
       {% endif %}
       - NO_PROXY={{ droneci_no_proxy | join(',') }}
       - no_proxy={{ droneci_no_proxy | join(',') }}
-    {% if droneci_docker_resources is defined %}
-    resources:
-      {{ droneci_docker_resources | to_nice_yaml | indent(6) }}
+    {% if droneci_memory_limit is defined %}
+    mem_limit: {{ droneci_memory_limit }}
+    {% endif %}
+    {% if droneci_memory_reservation is defined %}
+    mem_reservation: {{ droneci_memory_reservation }}
     {% endif %}
 
 {% if droneci_volumes | default([]) | rejectattr("bind") %}