From 1dc6ae53b341864a3153d6a637a7e21d2e3edfa6 Mon Sep 17 00:00:00 2001 From: Anton Zadvorny Date: Thu, 9 Jan 2020 11:06:30 +0300 Subject: [PATCH] Fix env interpolation for old compose versions --- docker-compose.config.yml | 14 +++++++------- docker-compose.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.config.yml b/docker-compose.config.yml index bc8b016..c568c3f 100644 --- a/docker-compose.config.yml +++ b/docker-compose.config.yml @@ -9,10 +9,10 @@ services: - ./templates:/templates - ./config:/config environment: - - TARGETS=${TARGETS:?err} - - ALERT_EMAIL_TO=${ALERT_EMAIL_TO:?err} - - ALERT_EMAIL_FROM=${ALERT_EMAIL_FROM:?err} - - ALERT_SMTP_HOST=${ALERT_SMTP_HOST:?err} - - ALERT_SMTP_USER=${ALERT_SMTP_USER:?err} - - ALERT_SMTP_PASSWORD=${ALERT_SMTP_PASSWORD:?err} - - ALERT_SLACK_WEBHOOK=${ALERT_SLACK_WEBHOOK:?err} + - TARGETS=${TARGETS} + - ALERT_EMAIL_TO=${ALERT_EMAIL_TO} + - ALERT_EMAIL_FROM=${ALERT_EMAIL_FROM} + - ALERT_SMTP_HOST=${ALERT_SMTP_HOST} + - ALERT_SMTP_USER=${ALERT_SMTP_USER} + - ALERT_SMTP_PASSWORD=${ALERT_SMTP_PASSWORD} + - ALERT_SLACK_WEBHOOK=${ALERT_SLACK_WEBHOOK} diff --git a/docker-compose.yml b/docker-compose.yml index 75b08cf..27ac6ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,8 +52,8 @@ services: - grafana_data:/var/lib/grafana - ./config/grafana/provisioning:/etc/grafana/provisioning environment: - - GF_SECURITY_ADMIN_USER=${GRAFANA_USER:?err} - - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD:?err} + - GF_SECURITY_ADMIN_USER=${GRAFANA_USER} + - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} - GF_USERS_ALLOW_SIGN_UP=false ports: - 3000:3000