ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5645 from gsiv/fix/m4-quote-env

Browse Source 
Docker config: Quote env vars read by m4
This commit is contained in:
Finn Stutzenstein 2020-10-20 12:59:25 +02:00 committed by GitHub
commit b864d67cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-compose.yml.m4
View File

@ -8,7 +8,9 @@ dnl ( set -a; source .env; m4 docker-compose.yml.m4 ) > docker-compose.yml
dnl dnl
dnl ---------------------------------------- dnl ----------------------------------------
divert(-1)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(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))')
define(`BACKEND_IMAGE', define(`BACKEND_IMAGE',

4
docker/docker-stack.yml.m4
View File

@ -8,7 +8,9 @@ dnl ( set -a; source .env; m4 docker-stack.yml.m4 ) > docker-stack.yml
dnl dnl
dnl ---------------------------------------- dnl ----------------------------------------
divert(-1)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(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))')
define(`BACKEND_IMAGE', define(`BACKEND_IMAGE',