|
@ -996,7 +996,7 @@ _get_compose_service_def_cached () { |
|
|
touch "$cache_file" || return 1 |
|
|
touch "$cache_file" || return 1 |
|
|
return 0 |
|
|
return 0 |
|
|
fi |
|
|
fi |
|
|
value=$(echo "$docker_compose" | shyaml get-value "$service" 2>/dev/null) |
|
|
|
|
|
|
|
|
value=$(echo "$docker_compose" | shyaml get-value "${service//./\\.}" 2>/dev/null) |
|
|
[ "$value" == None ] && value="" |
|
|
[ "$value" == None ] && value="" |
|
|
if ! echo "$value" | shyaml get-value "charm" >/dev/null 2>&1; then |
|
|
if ! echo "$value" | shyaml get-value "charm" >/dev/null 2>&1; then |
|
|
if charm.exists "$service"; then |
|
|
if charm.exists "$service"; then |
|
@ -1083,7 +1083,7 @@ get_service_def () { |
|
|
"\$_current_docker_compose has been calculated." |
|
|
"\$_current_docker_compose has been calculated." |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
def=$(echo "$_current_docker_compose" | shyaml get-value "services.$service" 2>/dev/null) |
|
|
|
|
|
|
|
|
def=$(echo "$_current_docker_compose" | shyaml get-value "services.${service//./\\.}" 2>/dev/null) |
|
|
if [ -z "$def" ]; then |
|
|
if [ -z "$def" ]; then |
|
|
err "No definition for service $DARKYELLOW$service$NORMAL in compiled 'docker-compose.yml'." |
|
|
err "No definition for service $DARKYELLOW$service$NORMAL in compiled 'docker-compose.yml'." |
|
|
return 1 |
|
|
return 1 |
|
|