fix compose v3 syntax

This commit is contained in:
Robert Kaussow 2020-06-15 23:54:20 +02:00
parent d2ca52aecb
commit 902d85f498
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
2 changed files with 13 additions and 9 deletions

View File

@ -48,10 +48,16 @@ droneci_networks:
droneci_networks_applied: droneci_networks_applied:
- droneci - droneci
# @var droneci_memory_limit: $ "_unset_" # @var droneci_docker_resources: $ "_unset_"
# @var droneci_memory_limit:example: $ "512m" # @var droneci_docker_resources:example: >
# @var droneci_memory_reservation: $ "_unset_" # droneci_docker_resources:
# @var droneci_memory_reservation:example: $ "256m" # limits:
# cpus: "0.50"
# memory: 50M
# reservations:
# cpus: "0.25"
# memory: 20M
# @end
droneci_db_type: sqlite droneci_db_type: sqlite
droneci_db_server: localhost droneci_db_server: localhost

View File

@ -62,11 +62,9 @@ services:
{% endif %} {% endif %}
- NO_PROXY={{ droneci_no_proxy | join(',') }} - NO_PROXY={{ droneci_no_proxy | join(',') }}
- no_proxy={{ droneci_no_proxy | join(',') }} - no_proxy={{ droneci_no_proxy | join(',') }}
{% if droneci_memory_limit is defined %} {% if droneci_docker_resources is defined %}
mem_limit: {{ droneci_memory_limit }} resources:
{% endif %} {{ droneci_docker_resources | to_nice_yaml | indent(6) }}
{% if droneci_memory_reservation is defined %}
mem_reservation: {{ droneci_memory_reservation }}
{% endif %} {% endif %}
{% if droneci_volumes | default([]) | rejectattr("bind") %} {% if droneci_volumes | default([]) | rejectattr("bind") %}