Revert "fix compose v3 syntax"

This reverts commit 347a10ebb1.
This commit is contained in:
Robert Kaussow 2020-06-16 00:03:42 +02:00
parent 347a10ebb1
commit 5b30664a0c
Signed by: xoxys
GPG Key ID: 65362AE74AF98B61
2 changed files with 9 additions and 13 deletions

View File

@ -11,16 +11,10 @@ droneci_runner_docker_service_directory: /var/lib/docker/services/droneci
droneci_runner_docker_socket_path: /var/run/docker.sock
droneci_runner_docker_service_stopped: False
# @var droneci_runner_docker_resources: $ "_unset_"
# @var droneci_runner_docker_resources:example: >
# droneci_runner_docker_resources:
# limits:
# cpus: "0.50"
# memory: 50M
# reservations:
# cpus: "0.25"
# memory: 20M
# @end
# @var droneci_runner_docker_memory_limit:example: $ "512m"
# @var droneci_runner_docker_memory_limit: $ "_unset_"
# @var droneci_runner_docker_memory_reservation:example: $ "256m"
# @var droneci_runner_docker_memory_reservation: $ "_unset_"
# @var droneci_runner_docker_networks:example: >
# droneci_runner_docker_networks:

View File

@ -20,9 +20,11 @@ services:
- DRONE_RPC_HOST={{ droneci_runner_docker_server }}
- DRONE_RPC_SECRET={{ droneci_runner_docker_secret }}
- DRONE_RUNNER_CAPACITY={{ droneci_runner_docker_capacity }}
{% if droneci_runner_docker_resources is defined %}
resources:
{{ droneci_runner_docker_resources | to_nice_yaml | indent(6) }}
{% if droneci_runner_docker_memory_limit is defined %}
mem_limit: {{ droneci_runner_docker_memory_limit }}
{% endif %}
{% if droneci_runner_docker_memory_reservation is defined %}
mem_reservation: {{ droneci_runner_docker_memory_reservation }}
{% endif %}
{% if droneci_runner_docker_networks | default([]) %}