From a7d0c161d5ad26018a45427ff34e2980ef21aae3 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Sun, 9 May 2021 18:18:48 +0200
Subject: [PATCH] fix(docker): entrypoint - use jq merge operator

---
 release/docker/docker-entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/docker/docker-entrypoint.sh b/release/docker/docker-entrypoint.sh
index b534c947d..a639c1c9f 100755
--- a/release/docker/docker-entrypoint.sh
+++ b/release/docker/docker-entrypoint.sh
@@ -61,11 +61,11 @@ if [ -n "${conf_vars:-}" ]; then
     keys="${var#DUNITER_CONF_}"
     keys="${keys//_/ }"
     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
   # Apply
   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"
     echo "=> Success."
   else
-- 
GitLab