浏览代码

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).
mmetc 2 年之前
父节点
当前提交
4137482f65
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      docker/docker_start.sh

+ 1 - 1
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
 }