From adf9f2d8aa01a73b67d1308f5c78fc42d772918c Mon Sep 17 00:00:00 2001 From: redsux Date: Fri, 21 Apr 2017 10:58:50 +0200 Subject: [PATCH] Fix issue #2936 Fix "sed" regex in docker-run.sh to use the VALIDATOR_URL environment variable. Don't use it in quotes if it's defined to "null" or "undefined". --- docker-run.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 088a9f8f..aa547321 100644 --- a/docker-run.sh +++ b/docker-run.sh @@ -39,7 +39,10 @@ fi if [[ -n "$VALIDATOR_URL" ]]; then sed -i "s|.*validatorUrl:.*$||g" $INDEX_FILE - sed -i "s|\(url: url,.*\)|\1\n validatorUrl: \"${VALIDATOR_URL}\",|g" $INDEX_FILE + TMP_VU="$VALIDATOR_URL" + [[ "$VALIDATOR_URL" != "null" && "$VALIDATOR_URL" != "undefined" ]] && TMP_VU="\"${VALIDATOR_URL}\"" + sed -i "s|\(url: .*,\)|\1\n validatorUrl: ${TMP_VU},|g" $INDEX_FILE + unset TMP_VU fi -exec nginx -g 'daemon off;' \ No newline at end of file +exec nginx -g 'daemon off;'