Revert "fix compose v3 syntax"

This reverts commit fb715e3459bf8e7d253204e818baedff6d67fa21.
This commit is contained in:
Robert Kaussow 2020-06-16 00:02:40 +02:00
parent 902d85f498
commit 01ea1cf575
Signed by: xoxys
GPG Key ID: 65362AE74AF98B61
2 changed files with 9 additions and 13 deletions

View File

@ -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

View File

@ -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") %}