From bf4dadf10508e0292e8279ce0d9dbdb352c1e42b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 6 Dec 2020 23:36:13 +0100 Subject: [PATCH] fix env runner variables --- defaults/main.yml | 5 ++++- templates/services/droneci_autoscaler_compose.yml.j2 | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3773b2f..a550603 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -98,7 +98,10 @@ droneci_autoscaler_instances: [] droneci_autoscaler_runner_volumes: [] droneci_autoscaler_runner_privileged: [] -droneci_autoscaler_runner_env_file: /etc/drone.conf + +# @var droneci_autoscaler_runner_env_file:description: The file needs to be mounted to the runner **and** agent. +# @var droneci_autoscaler_runner_env_file: $ "_unset_" +# @var droneci_autoscaler_runner_env_file:example: $ "/etc/drone.conf" # @var droneci_autoscaler_volumes:description: > # Define required docker volumes. If you don't use sqlite you could remove the default volume. diff --git a/templates/services/droneci_autoscaler_compose.yml.j2 b/templates/services/droneci_autoscaler_compose.yml.j2 index d99efe1..c077b05 100644 --- a/templates/services/droneci_autoscaler_compose.yml.j2 +++ b/templates/services/droneci_autoscaler_compose.yml.j2 @@ -59,8 +59,10 @@ services: {% if inst.runner_volumes | default(droneci_autoscaler_runner_volumes) | default(False) %} - DRONE_RUNNER_VOLUMES={{ inst.runner_volumes | default(droneci_autoscaler_runner_volumes) | join(",") }} {% endif %} - - DRONE_RUNNER_PRIVILEGED_IMAGES={{ inst.runner_privileged | default(droneci_autoscaler_runner_privileged) | join(",") }} - - DRONE_RUNNER_ENV_FILE={{ inst.runner_env_file | default(droneci_autoscaler_runner_env_file) }} + - DRONE_RUNNER_PRIVILEGED={{ inst.runner_privileged | default(droneci_autoscaler_runner_privileged) | join(",") }} + {% if inst.runner_env_file | default(droneci_autoscaler_runner_env_file) is defined %} + - DRONE_RUNNER_ENVFILE={{ inst.runner_env_file | default(droneci_autoscaler_runner_env_file) }} + {% endif %} - DRONE_GC_ENABLED={{ (inst.gc_enabled | default(droneci_autoscaler_gc_enabled)) | bool | lower }} - DRONE_GC_DEBUG=false - DRONE_REAPER_ENABLED=true