Skip to content
Snippets Groups Projects
Commit a7d0c161 authored by Gilles Filippini's avatar Gilles Filippini
Browse files

fix(docker): entrypoint - use jq merge operator

parent bcc435a2
No related branches found
No related tags found
No related merge requests found
...@@ -61,11 +61,11 @@ if [ -n "${conf_vars:-}" ]; then ...@@ -61,11 +61,11 @@ if [ -n "${conf_vars:-}" ]; then
keys="${var#DUNITER_CONF_}" keys="${var#DUNITER_CONF_}"
keys="${keys//_/ }" keys="${keys//_/ }"
value="$(eval echo "\$$var")" value="$(eval echo "\$$var")"
conf_json="$(echo "$conf_json" | jq -r '. += '"$(json_value $keys "$value")")" conf_json="$(echo "$conf_json" | jq -r '. *= '"$(json_value $keys "$value")")"
done done
# Apply # Apply
echo "Applying configuration: $conf_json" echo "Applying configuration: $conf_json"
if jq -r ". += $conf_json" "$home_default/conf.json" >"$home_default/conf.json.new"; then if jq -r ". *= $conf_json" "$home_default/conf.json" >"$home_default/conf.json.new"; then
mv "$home_default/conf.json.new" "$home_default/conf.json" mv "$home_default/conf.json.new" "$home_default/conf.json"
echo "=> Success." echo "=> Success."
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment