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).
This commit is contained in:
mmetc 2023-06-23 15:49:09 +02:00 committed by GitHub
parent 98c6038fde
commit 4137482f65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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
}