Browse Source

fix: dev: small improvements !minor

Signed-off-by: Valentin Lab <valentin.lab@kalysto.org>
lokavaluto/dev/master
Valentin Lab 5 years ago
parent
commit
a4c6e9e7cd
  1. 6
      bin/compose
  2. 6
      bin/compose-core

6
bin/compose

@ -857,9 +857,7 @@ mk_docker_run_options() {
clean_unused_sessions clean_unused_sessions
filename=$(mktemp -p /tmp/ -t launch_opts-XXXXXXXXXXXXXXXX) filename=$(mktemp -p /tmp/ -t launch_opts-XXXXXXXXXXXXXXXX)
{
p0 "${docker_run_opts[@]}"
} > "$filename"
p0 "${docker_run_opts[@]}" > "$filename"
sha=$(sha256sum "$filename") sha=$(sha256sum "$filename")
sha=${sha:0:64} sha=${sha:0:64}
src="$SESSION_DIR/$UID-$sha" src="$SESSION_DIR/$UID-$sha"
@ -872,7 +870,7 @@ mk_docker_run_options() {
mkdir -p "$SESSION_DIR" || return 1 mkdir -p "$SESSION_DIR" || return 1
mv -f "$filename" "$SESSION_DIR/$UID-$sha" || return 1 mv -f "$filename" "$SESSION_DIR/$UID-$sha" || return 1
echo "$SESSION_DIR/$UID-$sha"
e "$SESSION_DIR/$UID-$sha"
if [ -n "$DEBUG" ]; then if [ -n "$DEBUG" ]; then
echo "${WHITE}Environment:${NORMAL}" echo "${WHITE}Environment:${NORMAL}"

6
bin/compose-core

@ -3202,9 +3202,9 @@ launch_docker_compose() {
{ {
{ {
if [ -z "$COMPOSE_DISABLE_DOCKER_COMPOSE_STORE" ]; then if [ -z "$COMPOSE_DISABLE_DOCKER_COMPOSE_STORE" ]; then
cd "/var/lib/compose/docker-compose/$sha/$project"
cd "/var/lib/compose/docker-compose/$sha/$project" || return 1
else else
cd "$docker_compose_dir"
cd "$docker_compose_dir" || return 1
fi fi
if [ -f ".env" ]; then if [ -f ".env" ]; then
debug "${WHITE}.env$NORMAL for $DARKYELLOW$SERVICE_PACK$NORMAL:" debug "${WHITE}.env$NORMAL for $DARKYELLOW$SERVICE_PACK$NORMAL:"
@ -3222,7 +3222,7 @@ launch_docker_compose() {
} | _save stdout } | _save stdout
} 3>&1 1>&2 2>&3 | _save stderr } 3>&1 1>&2 2>&3 | _save stderr
} 3>&1 1>&2 2>&3 } 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" | grep -E "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'."
fi fi

Loading…
Cancel
Save