Skip to content

Commit

Permalink
Merge pull request moby#22303 from kencochrane/fix_integration_daemon…
Browse files Browse the repository at this point in the history
…_start

Fixing the PATH in .integration-daemon-start to find dyn docker binary
  • Loading branch information
tiborvass committed Apr 25, 2016
2 parents 5611424 + 5ee737c commit e974ead
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hack/make/.integration-daemon-start
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# see test-integration-cli for example usage of this script

base="$ABS_DEST/.."
export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary:$base/gccgo:$base/dyngccgo:$PATH"
export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary-client:$base/dynbinary-daemon:$base/gccgo:$base/dyngccgo:$PATH"

if ! command -v docker &> /dev/null; then
echo >&2 'error: binary-client or dynbinary-client must be run before .integration-daemon-start'
Expand Down Expand Up @@ -94,14 +94,14 @@ while ! docker version &> /dev/null; do
docker version >&2 || true
# Additional Windows CI debugging as this is a common error as of
# January 2016
if [ "$(go env GOOS)" = 'windows' ]; then
if [ "$(go env GOOS)" = 'windows' ]; then
echo >&2 "Container log below:"
echo >&2 "---"
# Important - use the docker on the CI host, not the one built locally
# which is currently in our path.
! /c/bin/docker -H=$MAIN_DOCKER_HOST logs docker-$COMMITHASH
echo >&2 "---"
fi
fi
fi
false
fi
Expand Down

0 comments on commit e974ead

Please sign in to comment.