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

Merge pull request #3303 from crosbymichael/add-host-flag

Browse Source 
Add DOCKER_HOST env var for client
Upstream-commit: 1bc3f6b7b5fd8d15df2238fc77f5aeb9624a6582
Component: engine
This commit is contained in:
Andy Rothfusz
2013-12-30 15:54:37 -08:00
parent 46e4624179 87ba43c927
commit 6c85a7de88
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/docker/docker.go
View File

@ -52,8 +52,13 @@ func main() {
return
}
if flHosts.Len() == 0 {
// If we do not have a host, default to unix socket
flHosts.Set(fmt.Sprintf("unix://%s", docker.DEFAULTUNIXSOCKET))
defaultHost := os.Getenv("DOCKER_HOST")
if defaultHost == "" || *flDaemon {
// If we do not have a host, default to unix socket
defaultHost = fmt.Sprintf("unix://%s", docker.DEFAULTUNIXSOCKET)
}
flHosts.Set(defaultHost)
}
if *bridgeName != "" && *bridgeIp != "" {

12
components/engine/docs/sources/commandline/cli.rst
View File

@ -52,6 +52,18 @@ To set the DNS server for all Docker containers, use ``docker -d -dns 8.8.8.8``.
To run the daemon with debug output, use ``docker -d -D``.
The docker client will also honor the ``DOCKER_HOST`` environment variable to set
the ``-H`` flag for the client.
::
docker -H tcp://0.0.0.0:4243 ps
# or
export DOCKER_HOST="tcp://0.0.0.0:4243"
docker ps
# both are equal
.. _cli_attach:
``attach``