From 4137482f65df3d815a4f61dbe4067168025c87be Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Fri, 23 Jun 2023 15:49:09 +0200
Subject: [PATCH] docker: always merge .yaml.local in conf_get() (#2272)

With this change, all queries to the configuration will return the
values from .local if they are set. However, conf_set will only write
to .yaml and never to .local. This means users can potentially override
values that are supposed to be under control of the entrypoint
(credentials and things set from envvars).
---
 docker/docker_start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker_start.sh b/docker/docker_start.sh
index 8ec449103..21b42dcb0 100755
--- a/docker/docker_start.sh
+++ b/docker/docker_start.sh
@@ -56,7 +56,7 @@ conf_get() {
     if [ $# -ge 2 ]; then
         yq e "$1" "$2"
     else
-        yq e "$1" "$CONFIG_FILE"
+        cscli config show-yaml | yq e "$1"
     fi
 }