Skip to content

Commit

Permalink
docker: always merge .yaml.local in conf_get() (#2272)
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
mmetc authored Jun 23, 2023
1 parent 98c6038 commit 4137482
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docker/docker_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 4137482

Please sign in to comment.