Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a few minor issues with building/running inside msysGit #10014

Merged
merged 1 commit into from
Jan 12, 2015

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 10, 2015

$ project/make.sh binary test-integration-cli
# WARNING! I don't seem to be running in the Docker container.
# The result of this command might be an incorrect build, and will not be
#   officially supported.
#
# Try this instead: make all
#

---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /c/Jenkins/gopath/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev.exe

---> Making bundle: test-integration-cli (in bundles/1.4.1-dev/test-integration-cli)
/c/Jenkins/gopath/src/github.com/docker/docker/project/make/test-integration-cli: cannot make pipe for process substitution: Function not implemented
/c/Jenkins/gopath/src/github.com/docker/docker/project/make/test-integration-cli: cannot make pipe for process substitution: Function not implemented
/c/Jenkins/gopath/src/github.com/docker/docker/project/make/test-integration-cli: line 11: >(tee -a $DEST/test.log): ambiguous redirect

@tianon tianon force-pushed the fix-msys branch 2 times, most recently from 7d37161 to d48f397 Compare January 10, 2015 00:27
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
@tianon
Copy link
Member Author

tianon commented Jan 10, 2015

@tianon
Copy link
Member Author

tianon commented Jan 10, 2015

(temporarily hacked up the Jenkins windows builder to build my branch to demonstrate the glory)

@jessfraz
Copy link
Contributor

Sooooo legit

On Friday, January 9, 2015, Tianon Gravi notifications@github.com wrote:

(temporarily hacked up the Jenkins windows builder to build my branch to
demonstrate the glory)


Reply to this email directly or view it on GitHub
#10014 (comment).

@jessfraz
Copy link
Contributor

LGTM

fmt.Printf("ERROR: couldn't resolve full path to the Docker binary (%v)", err)
os.Exit(1)
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea what's going on here, but logic is changed. Now data from LookPath will override DOCKER_BINARY. Maybe that's your plan...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually killing me. We were shelling out to which in order to ask the OS where docker is, when that's literally what exec.LookPath does (but also what exec.Command itself will do, which is how we could even shell out to just which in the first place).

I figured the point of touching dockerBinary at all was to get a full path to the binary, so I switched the logic a bit to run LookPath regardless such that DOCKER_BINARY could be set to something like docker-1.4.1-dev and have that be searched on the PATH as well here instead of in every single exec.Command.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, got it.

@crosbymichael
Copy link
Contributor

LGTM

crosbymichael added a commit that referenced this pull request Jan 12, 2015
Fix a few minor issues with building/running inside msysGit
@crosbymichael crosbymichael merged commit 862a124 into moby:master Jan 12, 2015
@tianon tianon deleted the fix-msys branch January 12, 2015 19:46
@tianon
Copy link
Member Author

tianon commented Jan 12, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants