Browse Source

fix: some cosmetic corrections !minor

raw-remaining-args
Valentin Lab 9 years ago
parent
commit
f015db4f0f
  1. 6
      bin/compose

6
bin/compose

@ -348,7 +348,7 @@ get_docker_compose () {
for target_service in "$@"; do for target_service in "$@"; do
start=$SECONDS start=$SECONDS
services=$(get_ordered_service_dependencies "$target_service") || return 1 services=$(get_ordered_service_dependencies "$target_service") || return 1
debug " $DARKYELLOW$target_service$NORMAL deps:$DARKYELLOW" $services "$NORMAL $GRAY(in $((SECONDS - start)))s$NORMAL"
debug " $DARKYELLOW$target_service$NORMAL deps:$DARKYELLOW" $services "$NORMAL$GRAY(in $((SECONDS - start))s)$NORMAL"
for service in $services; do for service in $services; do
if [ "${entries[$service]}" ]; then if [ "${entries[$service]}" ]; then
@ -362,7 +362,7 @@ get_docker_compose () {
## if this is a subordinate service ## if this is a subordinate service
start_service=$SECONDS start_service=$SECONDS
entries[$service]=$(_get_docker_compose_service_mixin "$service") || return 1 entries[$service]=$(_get_docker_compose_service_mixin "$service") || return 1
debug " Applied $DARKYELLOW$service$NORMAL charm metadata mixins $GRAY(in $((SECONDS - start_service)))s$NORMAL"
debug " Applied $DARKYELLOW$service$NORMAL charm metadata mixins $GRAY(in $((SECONDS - start_service))s)$NORMAL"
done done
debug " ..finished all mixins for $DARKYELLOW$target_service$NORMAL $GRAY(in $((SECONDS - start))s)$NORMAL" debug " ..finished all mixins for $DARKYELLOW$target_service$NORMAL $GRAY(in $((SECONDS - start))s)$NORMAL"
done done
@ -370,7 +370,7 @@ get_docker_compose () {
merge_yaml_str "${entries[@]}" > "$cache_file" merge_yaml_str "${entries[@]}" > "$cache_file"
export _current_docker_compose="$(cat "$cache_file")" export _current_docker_compose="$(cat "$cache_file")"
echo "$_current_docker_compose" echo "$_current_docker_compose"
debug " ..Compilation of base 'docker-compose.conf' done.$GRAY(in $((SECONDS - start_compilation))s)$NORMAL" || true
debug " ..compilation of base 'docker-compose.conf' done $GRAY(in $((SECONDS - start_compilation))s)$NORMAL" || true
# debug " ** ${WHITE}docker-compose.conf${NORMAL}:" # debug " ** ${WHITE}docker-compose.conf${NORMAL}:"
# debug "$_current_docker_compose" # debug "$_current_docker_compose"
} }

Loading…
Cancel
Save