From 2305ca9d218f4eb625e26ae76751baee0e372042 Mon Sep 17 00:00:00 2001 From: Gernot Schulz Date: Thu, 8 Oct 2020 14:45:23 +0200 Subject: [PATCH] Docker config: Quote env vars read by m4 --- docker/docker-compose.yml.m4 | 4 +++- docker/docker-stack.yml.m4 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4 index 6d7d86780..d3eece276 100644 --- a/docker/docker-compose.yml.m4 +++ b/docker/docker-compose.yml.m4 @@ -8,7 +8,9 @@ dnl ( set -a; source .env; m4 docker-compose.yml.m4 ) > docker-compose.yml dnl dnl ---------------------------------------- divert(-1)dnl -define(`read_env', `esyscmd(`printf "%s" "$$1"')') +dnl return env variable (quoted) +define(`read_env', `esyscmd(`printf "\`%s'" "$$1"')') +dnl return env variable if set; otherwise, return given alternative value define(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))') define(`BACKEND_IMAGE', diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4 index 005aefc7d..7e55656ca 100644 --- a/docker/docker-stack.yml.m4 +++ b/docker/docker-stack.yml.m4 @@ -8,7 +8,9 @@ dnl ( set -a; source .env; m4 docker-stack.yml.m4 ) > docker-stack.yml dnl dnl ---------------------------------------- divert(-1)dnl -define(`read_env', `esyscmd(`printf "%s" "$$1"')') +dnl return env variable (quoted) +define(`read_env', `esyscmd(`printf "\`%s'" "$$1"')') +dnl return env variable if set; otherwise, return given alternative value define(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))') define(`BACKEND_IMAGE',