Browse code

Update docker daemon to dockerd

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>

yuexiao-wang authored on 2016/12/26 23:27:56
Showing 10 changed files
... ...
@@ -31,7 +31,7 @@ stop on runlevel [!2345]
31 31
 respawn
32 32
 
33 33
 script
34
-    /usr/bin/docker daemon -H=tcp://0.0.0.0:2375
34
+    /usr/bin/dockerd -H=tcp://0.0.0.0:2375
35 35
 end script
36 36
 ```
37 37
 
... ...
@@ -21,7 +21,7 @@ type bridgeConfig struct {
21 21
 
22 22
 // Config defines the configuration of a docker daemon.
23 23
 // These are the configuration settings that you pass
24
-// to the docker daemon when you launch it with say: `docker daemon -e windows`
24
+// to the docker daemon when you launch it with say: `dockerd -e windows`
25 25
 type Config struct {
26 26
 	CommonConfig
27 27
 
... ...
@@ -88,7 +88,7 @@ status information about the driver.
88 88
 
89 89
 The devicemapper backend supports some options that you can specify
90 90
 when starting the docker daemon using the `--storage-opt` flags.
91
-This uses the `dm` prefix and would be used something like `docker daemon --storage-opt dm.foo=bar`.
91
+This uses the `dm` prefix and would be used something like `dockerd --storage-opt dm.foo=bar`.
92 92
 
93 93
 These options are currently documented both in [the man
94 94
 page](../../../man/docker.1.md) and in [the online
... ...
@@ -715,7 +715,7 @@ with the `--exec-opt` flag. All the flag's options have the `native` prefix. A
715 715
 single `native.cgroupdriver` option is available.
716 716
 
717 717
 The `native.cgroupdriver` option specifies the management of the container's
718
-cgroups. You can specify only specify `cgroupfs` or `systemd`. If you specify
718
+cgroups. You can only specify `cgroupfs` or `systemd`. If you specify
719 719
 `systemd` and it is not available, the system errors out. If you omit the
720 720
 `native.cgroupdriver` option,` cgroupfs` is used.
721 721
 
... ...
@@ -730,8 +730,8 @@ Setting this option applies to all containers the daemon launches.
730 730
 Also Windows Container makes use of `--exec-opt` for special purpose. Docker user
731 731
 can specify default container isolation technology with this, for example:
732 732
 
733
-```bash
734
-$ sudo dockerd --exec-opt isolation=hyperv
733
+```console
734
+> dockerd --exec-opt isolation=hyperv
735 735
 ```
736 736
 
737 737
 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:
746 746
 $ sudo dockerd --dns 8.8.8.8
747 747
 ```
748 748
 
749
-
750 749
 To set the DNS search domain for all Docker containers, use:
751 750
 
752 751
 ```bash
753 752
 $ sudo dockerd --dns-search example.com
754 753
 ```
755 754
 
756
-
757 755
 ## Insecure registries
758 756
 
759 757
 Docker considers a private registry either secure or insecure. In the rest of
... ...
@@ -188,7 +188,7 @@ if [ $ec -eq 0 ]; then
188 188
 FROM docker:$COMMITHASH
189 189
 RUN hack/make.sh binary
190 190
 RUN cp bundles/latest/binary/docker /bin/docker 
191
-CMD docker daemon -D -H tcp://0.0.0.0:$port_inner $daemon_extra_args
191
+CMD dockerd -D -H tcp://0.0.0.0:$port_inner $daemon_extra_args
192 192
 EOF
193 193
 	else
194 194
 		set -x
... ...
@@ -9,7 +9,7 @@ import (
9 9
 )
10 10
 
11 11
 var (
12
-	// DefaultHTTPPort Default HTTP Port used if only the protocol is provided to -H flag e.g. docker daemon -H tcp://
12
+	// DefaultHTTPPort Default HTTP Port used if only the protocol is provided to -H flag e.g. dockerd -H tcp://
13 13
 	// These are the IANA registered port numbers for use with Docker
14 14
 	// see http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
15 15
 	DefaultHTTPPort = 2375 // Default HTTP Port
... ...
@@ -2,5 +2,5 @@
2 2
 
3 3
 package opts
4 4
 
5
-// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080
5
+// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. dockerd -H tcp://:8080
6 6
 const DefaultHTTPHost = "localhost"
... ...
@@ -52,5 +52,5 @@ package opts
52 52
 // to the delay if a user were to do 'docker run -H=tcp://localhost:2375...'
53 53
 // explicitly.
54 54
 
55
-// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080
55
+// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. dockerd -H tcp://:8080
56 56
 const DefaultHTTPHost = "127.0.0.1"
... ...
@@ -17,7 +17,7 @@ the address Docker uses to advertise the node using the `--cluster-advertise`
17 17
 flag.
18 18
 
19 19
 ```bash
20
-$ docker daemon -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store etcd://<etcd_ip1>,<etcd_ip2>/<path>
20
+$ dockerd -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store etcd://<etcd_ip1>,<etcd_ip2>/<path>
21 21
 ```
22 22
 
23 23
 ### Using consul
... ...
@@ -27,7 +27,7 @@ the address Docker uses to advertise the node using the `--cluster-advertise`
27 27
 flag.
28 28
 
29 29
 ```bash
30
-$ docker daemon -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store consul://<consul_ip>/<path>
30
+$ dockerd -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store consul://<consul_ip>/<path>
31 31
 ```
32 32
 
33 33
 ### Using zookeeper
... ...
@@ -37,5 +37,5 @@ the address Docker uses to advertise the node using the `--cluster-advertise`
37 37
 flag.
38 38
 
39 39
 ```bash
40
-$ docker daemon -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store zk://<zk_addr1>,<zk_addr2>/<path>
40
+$ dockerd -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store zk://<zk_addr1>,<zk_addr2>/<path>
41 41
 ```
... ...
@@ -292,7 +292,7 @@ appropriate for your distro's init script to live there too!).
292 292
 In general, Docker should be run as root, similar to the following:
293 293
 
294 294
 ```bash
295
-docker daemon
295
+dockerd
296 296
 ```
297 297
 
298 298
 Generally, a `DOCKER_OPTS` variable of some kind is available for adding more