Browse Source

fix: ``default-options`` in charms was not read as expected

hostresources
Valentin Lab 6 years ago
parent
commit
91934b51d9
  1. 1
      bin/compose-core

1
bin/compose-core

@ -1153,6 +1153,7 @@ get_compose_service_def () {
docker_compose=$(get_compose_yml_content) || return 1 docker_compose=$(get_compose_yml_content) || return 1
result=$(_get_compose_service_def_cached "$service" "$docker_compose") || return 1 result=$(_get_compose_service_def_cached "$service" "$docker_compose") || return 1
charm=$(echo "$result" |shyaml get-value charm 2>/dev/null) || return 1 charm=$(echo "$result" |shyaml get-value charm 2>/dev/null) || return 1
metadata=$(charm.metadata "$charm") || return 1
if default_options=$(printf "%s" "$metadata" | shyaml -y -q get-value default-options); then if default_options=$(printf "%s" "$metadata" | shyaml -y -q get-value default-options); then
default_options=$(yaml_key_val_str "options" "$default_options") || return 1 default_options=$(yaml_key_val_str "options" "$default_options") || return 1
result=$(merge_yaml_str "$default_options" "$result") || return 1 result=$(merge_yaml_str "$default_options" "$result") || return 1

Loading…
Cancel
Save