From 5ee737c70c7b8f7a0a915ca048538ee12cf1d737 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Mon, 25 Apr 2016 11:18:34 -0400 Subject: [PATCH] Fixing the PATH in .integration-daemon-start to find dynamic docker binary Signed-off-by: Ken Cochrane --- hack/make/.integration-daemon-start | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start index 8d8d4dcfa0..61324081c4 100644 --- a/hack/make/.integration-daemon-start +++ b/hack/make/.integration-daemon-start @@ -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