diff --git a/contrib/vagrant-docker/README.md b/contrib/vagrant-docker/README.md index 286a98504a..aeba4a7b2d 100644 --- a/contrib/vagrant-docker/README.md +++ b/contrib/vagrant-docker/README.md @@ -31,7 +31,7 @@ stop on runlevel [!2345] respawn script - /usr/bin/docker daemon -H=tcp://0.0.0.0:2375 + /usr/bin/dockerd -H=tcp://0.0.0.0:2375 end script ``` diff --git a/daemon/config_windows.go b/daemon/config_windows.go index df59dcf302..ec3f84005c 100644 --- a/daemon/config_windows.go +++ b/daemon/config_windows.go @@ -21,7 +21,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 daemon -e windows` +// to the docker daemon when you launch it with say: `dockerd -e windows` type Config struct { CommonConfig diff --git a/daemon/graphdriver/devmapper/README.md b/daemon/graphdriver/devmapper/README.md index 792474a8a7..bed07869a0 100644 --- a/daemon/graphdriver/devmapper/README.md +++ b/daemon/graphdriver/devmapper/README.md @@ -88,7 +88,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 daemon --storage-opt dm.foo=bar`. +This uses the `dm` prefix and would be used something like `dockerd --storage-opt dm.foo=bar`. These options are currently documented both in [the man page](../../../man/docker.1.md) and in [the online diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 24ac77611d..cfbb4b3068 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -715,7 +715,7 @@ with the `--exec-opt` flag. All the flag's options have the `native` prefix. A single `native.cgroupdriver` option is available. The `native.cgroupdriver` option specifies the management of the container's -cgroups. You can specify only specify `cgroupfs` or `systemd`. If you specify +cgroups. You can only specify `cgroupfs` or `systemd`. If you specify `systemd` and it is not available, the system errors out. If you omit the `native.cgroupdriver` option,` cgroupfs` is used. @@ -730,8 +730,8 @@ Setting this option applies to all containers the daemon launches. Also Windows Container makes use of `--exec-opt` for special purpose. Docker user can specify default container isolation technology with this, for example: -```bash -$ sudo dockerd --exec-opt isolation=hyperv +```console +> dockerd --exec-opt isolation=hyperv ``` Will make `hyperv` the default isolation technology on Windows. If no isolation @@ -746,14 +746,12 @@ To set the DNS server for all Docker containers, use: $ sudo dockerd --dns 8.8.8.8 ``` - To set the DNS search domain for all Docker containers, use: ```bash $ sudo dockerd --dns-search example.com ``` - ## Insecure registries Docker considers a private registry either secure or insecure. In the rest of diff --git a/hack/Jenkins/W2L/setup.sh b/hack/Jenkins/W2L/setup.sh index 30e5884d97..3d211be6f7 100644 --- a/hack/Jenkins/W2L/setup.sh +++ b/hack/Jenkins/W2L/setup.sh @@ -188,7 +188,7 @@ if [ $ec -eq 0 ]; then FROM docker:$COMMITHASH RUN hack/make.sh binary RUN cp bundles/latest/binary/docker /bin/docker -CMD docker daemon -D -H tcp://0.0.0.0:$port_inner $daemon_extra_args +CMD dockerd -D -H tcp://0.0.0.0:$port_inner $daemon_extra_args EOF else set -x diff --git a/opts/hosts.go b/opts/hosts.go index 1107b7209f..a065d03b09 100644 --- a/opts/hosts.go +++ b/opts/hosts.go @@ -9,7 +9,7 @@ import ( ) var ( - // DefaultHTTPPort Default HTTP Port used if only the protocol is provided to -H flag e.g. docker daemon -H tcp:// + // DefaultHTTPPort Default HTTP Port used if only the protocol is provided to -H flag e.g. dockerd -H tcp:// // These are the IANA registered port numbers for use with Docker // see http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker DefaultHTTPPort = 2375 // Default HTTP Port diff --git a/opts/opts_unix.go b/opts/opts_unix.go index f1ce844a8f..2766a43a08 100644 --- a/opts/opts_unix.go +++ b/opts/opts_unix.go @@ -2,5 +2,5 @@ package opts -// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080 +// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. dockerd -H tcp://:8080 const DefaultHTTPHost = "localhost" diff --git a/opts/opts_windows.go b/opts/opts_windows.go index ebe40c969c..98b7251a9e 100644 --- a/opts/opts_windows.go +++ b/opts/opts_windows.go @@ -52,5 +52,5 @@ package opts // to the delay if a user were to do 'docker run -H=tcp://localhost:2375...' // explicitly. -// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080 +// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. dockerd -H tcp://:8080 const DefaultHTTPHost = "127.0.0.1" diff --git a/pkg/discovery/README.md b/pkg/discovery/README.md index 39777c2171..d8ed9ce71e 100644 --- a/pkg/discovery/README.md +++ b/pkg/discovery/README.md @@ -17,7 +17,7 @@ the address Docker uses to advertise the node using the `--cluster-advertise` flag. ```bash -$ docker daemon -H= --cluster-advertise= --cluster-store etcd://,/ +$ dockerd -H= --cluster-advertise= --cluster-store etcd://,/ ``` ### Using consul @@ -27,7 +27,7 @@ the address Docker uses to advertise the node using the `--cluster-advertise` flag. ```bash -$ docker daemon -H= --cluster-advertise= --cluster-store consul:/// +$ dockerd -H= --cluster-advertise= --cluster-store consul:/// ``` ### Using zookeeper @@ -37,5 +37,5 @@ the address Docker uses to advertise the node using the `--cluster-advertise` flag. ```bash -$ docker daemon -H= --cluster-advertise= --cluster-store zk://,/ +$ dockerd -H= --cluster-advertise= --cluster-store zk://,/ ``` diff --git a/project/PACKAGERS.md b/project/PACKAGERS.md index 46ea8e7b20..a5b0018b5a 100644 --- a/project/PACKAGERS.md +++ b/project/PACKAGERS.md @@ -292,7 +292,7 @@ appropriate for your distro's init script to live there too!). In general, Docker should be run as root, similar to the following: ```bash -docker daemon +dockerd ``` Generally, a `DOCKER_OPTS` variable of some kind is available for adding more