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

Merge pull request #15445 from hqhq/hq_use_docker_daemon

Browse Source 
Change all docker -d to docker daemon
Upstream-commit: 51249a3aa09b8e1ade07ed6be0029a190b978b05
Component: engine
This commit is contained in:
Brian Goff
2015-08-10 10:35:19 -04:00
parent 9ea0204024 8120b4d8fe
commit 2db4446de9
15 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/config_unix.go
+1 -1
View File
@@ -18,7 +18,7 @@ var (
// Config defines the configuration of a docker daemon.
// These are the configuration settings that you pass
// to the docker daemon when you launch it with say: `docker -d -e lxc`
// to the docker daemon when you launch it with say: `docker daemon -e lxc`
type Config struct {
CommonConfig
components/engine/daemon/config_windows.go
+1 -1
View File
@@ -20,7 +20,7 @@ type bridgeConfig struct {
// Config defines the configuration of a docker daemon.
// These are the configuration settings that you pass
// to the docker daemon when you launch it with say: `docker -d -e windows`
// to the docker daemon when you launch it with say: `docker daemon -e windows`
type Config struct {
CommonConfig
components/engine/daemon/graphdriver/devmapper/README.md
+1 -1
View File
@@ -75,7 +75,7 @@ status information about the driver.
The devicemapper backend supports some options that you can specify
when starting the docker daemon using the `--storage-opt` flags.
This uses the `dm` prefix and would be used something like `docker -d --storage-opt dm.foo=bar`.
This uses the `dm` prefix and would be used something like `docker daemon --storage-opt dm.foo=bar`.
These options are currently documented both in [the man
page](../../../man/docker.1.md) and in [the online