kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #22303 from kencochrane/fix_integration_daemon_start 

Fixing the PATH in .integration-daemon-start to find dyn docker binary
This commit is contained in:
Tibor Vass 2016-04-25 14:39:45 -04:00
parent 5611424d82 5ee737c70c
commit e974eadd94
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/make/.integration-daemon-start
View File

@ -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'
@ -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