Revert "fix compose v3 syntax"
This reverts commit fb715e3459bf8e7d253204e818baedff6d67fa21.
This commit is contained in:
parent
902d85f498
commit
01ea1cf575
@ -48,16 +48,10 @@ droneci_networks:
|
|||||||
droneci_networks_applied:
|
droneci_networks_applied:
|
||||||
- droneci
|
- droneci
|
||||||
|
|
||||||
# @var droneci_docker_resources: $ "_unset_"
|
# @var droneci_memory_limit: $ "_unset_"
|
||||||
# @var droneci_docker_resources:example: >
|
# @var droneci_memory_limit:example: $ "512m"
|
||||||
# droneci_docker_resources:
|
# @var droneci_memory_reservation: $ "_unset_"
|
||||||
# limits:
|
# @var droneci_memory_reservation:example: $ "256m"
|
||||||
# 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
|
||||||
|
@ -62,9 +62,11 @@ 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_docker_resources is defined %}
|
{% if droneci_memory_limit is defined %}
|
||||||
resources:
|
mem_limit: {{ droneci_memory_limit }}
|
||||||
{{ droneci_docker_resources | to_nice_yaml | indent(6) }}
|
{% endif %}
|
||||||
|
{% 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") %}
|
||||||
|
Loading…
Reference in New Issue
Block a user