|
|
@ -1152,7 +1152,7 @@ get_compose_service_def () { |
|
|
[ -z "$service" ] && print_syntax_error "Missing service as first argument." |
|
|
[ -z "$service" ] && print_syntax_error "Missing service as first argument." |
|
|
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 |
|
|
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 |
|
|
@ -1528,7 +1528,7 @@ setup_host_resources () { |
|
|
|
|
|
|
|
|
declare -A loaded |
|
|
declare -A loaded |
|
|
for service in "$@"; do |
|
|
for service in "$@"; do |
|
|
subservices=$(get_ordered_service_dependencies "$service") || return 1 |
|
|
|
|
|
|
|
|
subservices=$(get_ordered_service_dependencies "$service") || return 1 |
|
|
for subservice in $subservices; do |
|
|
for subservice in $subservices; do |
|
|
if [ "${loaded[$subservice]}" ]; then |
|
|
if [ "${loaded[$subservice]}" ]; then |
|
|
## Prevent double inclusion of same service if this |
|
|
## Prevent double inclusion of same service if this |
|
|
|
