toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Build two binaries client and daemon.

Browse Source 
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9e7651db4d464649bc32cf346fdee8c6900ebe0f
Component: engine
This commit is contained in:
Daniel Nephin
2016-02-19 17:42:51 -05:00
parent 3e3ec58c45
commit dcd6f9747a
37 changed files with 413 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/integration-cli/docker_utils.go
View File

@ -1290,6 +1290,9 @@ func appendBaseEnv(isTLS bool, env ...string) []string {
// windows: requires preserving SystemRoot, otherwise dial tcp fails
// with "GetAddrInfoW: A non-recoverable error occurred during a database lookup."
"SystemRoot",
// testing help text requires the $PATH to dockerd is set
"PATH",
}
if isTLS {
preserveList = append(preserveList, "DOCKER_TLS_VERIFY", "DOCKER_CERT_PATH")