Browse Source

fix: any output of compose was redirected to standard error.

hostresources
Valentin Lab 6 years ago
parent
commit
3760343dbc
  1. 4
      bin/compose-core

4
bin/compose-core

@ -3105,6 +3105,7 @@ launch_docker_compose() {
sha=$(docker_compose_store "$docker_compose_dir/docker-compose.yml") || return 1 sha=$(docker_compose_store "$docker_compose_dir/docker-compose.yml") || return 1
fi fi
{
{ {
{ {
if [ -z "$COMPOSE_DISABLE_DOCKER_COMPOSE_STORE" ]; then if [ -z "$COMPOSE_DISABLE_DOCKER_COMPOSE_STORE" ]; then
@ -3126,7 +3127,8 @@ launch_docker_compose() {
fi fi
echo "$?" > "$docker_compose_dir/.data/errlvl" echo "$?" > "$docker_compose_dir/.data/errlvl"
} | _save stdout } | _save stdout
} 3>&1 1>&2 2>&3 | _save stderr 3>&1 1>&2 2>&3
} 3>&1 1>&2 2>&3 | _save stderr
} 3>&1 1>&2 2>&3
if tail -n 1 "$docker_compose_dir/.data/stderr" | egrep "Service .+ failed to build: Error getting container [0-9a-f]+ from driver devicemapper: (open|Error mounting) /dev/mapper/docker-.*: no such file or directory$" >/dev/null 2>&1; then if tail -n 1 "$docker_compose_dir/.data/stderr" | egrep "Service .+ failed to build: Error getting container [0-9a-f]+ from driver devicemapper: (open|Error mounting) /dev/mapper/docker-.*: no such file or directory$" >/dev/null 2>&1; then
err "Detected bug https://github.com/docker/docker/issues/4036 ... " err "Detected bug https://github.com/docker/docker/issues/4036 ... "
err "Please re-launch your command, or switch from 'devicemapper' driver to 'overlayfs' or 'aufs'." err "Please re-launch your command, or switch from 'devicemapper' driver to 'overlayfs' or 'aufs'."

Loading…
Cancel
Save