From 97b29f354c0e5ded09200a2f02f3226e212f6de9 Mon Sep 17 00:00:00 2001 From: Leopere Date: Sun, 11 Nov 2018 21:20:04 -0500 Subject: [PATCH] removed unknown flag --- chainquery/Dockerfile | 2 +- chainquery/stuff/start.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/chainquery/Dockerfile b/chainquery/Dockerfile index 163f405..c469a95 100644 --- a/chainquery/Dockerfile +++ b/chainquery/Dockerfile @@ -34,7 +34,7 @@ COPY stuff/chainqueryconfig.toml /etc/chainquery/ ## Get latest chainqueryconfig.toml from master on github as template. # TODO: add magic which pattern matches for chainqueryconfig.toml DEFAULT strings and replaces them with configured settings on container start. -ADD --chown=1000:1000 https://raw.githubusercontent.com/lbryio/chainquery/master/config/default/chainqueryconfig.toml /etc/chainquery/chainqueryconfig.toml.orig +ADD https://raw.githubusercontent.com/lbryio/chainquery/master/config/default/chainqueryconfig.toml /etc/chainquery/chainqueryconfig.toml.orig ## Install start.sh as executable script in container $PATH COPY stuff/start.sh /usr/local/bin/start diff --git a/chainquery/stuff/start.sh b/chainquery/stuff/start.sh index 0954254..de75642 100755 --- a/chainquery/stuff/start.sh +++ b/chainquery/stuff/start.sh @@ -22,21 +22,22 @@ CONFIG_SETTINGS=( APIMYSQLDSN ) -function set_configs(parameter) { +function set_configs() { ## Set configs on container start if not already set. for i in "${!CONFIG_SETTINGS[@]}"; do - echo ${CONFIG_SETTINGS[$i]}"_KEY" ## Indirect references http://tldp.org/LDP/abs/html/ivr.html eval FROM_STRING=\$"${CONFIG_SETTINGS[$i]}_DEFAULT" eval TO_STRING=\$${CONFIG_SETTINGS[$i]} ## TODO: Add a bit more magic to make sure that you're only configuring things if not set by config mounts. - sed -i '' "s/$FROM_STRING/$TO_STRING/g" /etc/chainquery/chainqueryconfig.toml + sed -i '' "s~$FROM_STRING~$TO_STRING~g" /etc/chainquery/chainqueryconfig.toml done } if [[ ! -f /etc/chainquery/chainqueryconfig.toml ]]; then echo "[INFO]: Found no chainqueryconfig.toml" echo " Installing default and configuring with provided environment variables if any." + ## Install fresh copy of config file. + cp /etc/chainquery/chainqueryconfig.toml.orig /etc/chainquery/chainqueryconfig.toml set_configs else echo "[INFO]: Found a copy of chainqueryconfig.toml in /etc/chainquery"