Commit Graph

2 Commits

Author SHA1 Message Date
f856b40438 Cleanup from CR.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0acfccc7be6c49bf243821e535dfe1122ff5a52
Component: engine
2016-04-23 15:05:15 -04:00
dcd6f9747a Build two binaries client and daemon.
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
2016-04-22 11:26:01 -04:00