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>
This commit is contained in:
Daniel Nephin
2016-02-19 17:42:51 -05:00
parent 9b00817dc6
commit 9e7651db4d
37 changed files with 413 additions and 238 deletions

View File

@@ -216,10 +216,10 @@ the file "./VERSION". This binary is usually installed somewhere like
### Dynamic Daemon / Client-only Binary
If you are only interested in a Docker client binary, set `DOCKER_CLIENTONLY` to a non-empty value using something similar to the following:
If you are only interested in a Docker client binary, you can build using:
```bash
export DOCKER_CLIENTONLY=1
./hack/make.sh binary-client
```
If you need to (due to distro policy, distro library availability, or for other
@@ -228,10 +228,10 @@ interested in creating a client binary for Docker, use something similar to the
following:
```bash
./hack/make.sh dynbinary
./hack/make.sh dynbinary-client
```
This will create "./bundles/$VERSION/dynbinary/docker-$VERSION", which for
This will create "./bundles/$VERSION/dynbinary-client/docker-$VERSION", which for
client-only builds is the important file to grab and install as appropriate.
## System Dependencies