Signed-off-by: bin liu <liubin0329@gmail.com>
| ... | ... |
@@ -15,7 +15,7 @@ type diffOptions struct {
|
| 15 | 15 |
container string |
| 16 | 16 |
} |
| 17 | 17 |
|
| 18 |
-// NewDiffCommand creats a new cobra.Command for `docker diff` |
|
| 18 |
+// NewDiffCommand creates a new cobra.Command for `docker diff` |
|
| 19 | 19 |
func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command {
|
| 20 | 20 |
var opts diffOptions |
| 21 | 21 |
|
| ... | ... |
@@ -18,7 +18,7 @@ type restartOptions struct {
|
| 18 | 18 |
containers []string |
| 19 | 19 |
} |
| 20 | 20 |
|
| 21 |
-// NewRestartCommand creats a new cobra.Command for `docker restart` |
|
| 21 |
+// NewRestartCommand creates a new cobra.Command for `docker restart` |
|
| 22 | 22 |
func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command {
|
| 23 | 23 |
var opts restartOptions |
| 24 | 24 |
|
| ... | ... |
@@ -20,7 +20,7 @@ type rmOptions struct {
|
| 20 | 20 |
containers []string |
| 21 | 21 |
} |
| 22 | 22 |
|
| 23 |
-// NewRmCommand creats a new cobra.Command for `docker rm` |
|
| 23 |
+// NewRmCommand creates a new cobra.Command for `docker rm` |
|
| 24 | 24 |
func NewRmCommand(dockerCli *client.DockerCli) *cobra.Command {
|
| 25 | 25 |
var opts rmOptions |
| 26 | 26 |
|
| ... | ... |
@@ -18,7 +18,7 @@ type topOptions struct {
|
| 18 | 18 |
args []string |
| 19 | 19 |
} |
| 20 | 20 |
|
| 21 |
-// NewTopCommand creats a new cobra.Command for `docker top` |
|
| 21 |
+// NewTopCommand creates a new cobra.Command for `docker top` |
|
| 22 | 22 |
func NewTopCommand(dockerCli *client.DockerCli) *cobra.Command {
|
| 23 | 23 |
var opts topOptions |
| 24 | 24 |
|
| ... | ... |
@@ -15,7 +15,7 @@ type waitOptions struct {
|
| 15 | 15 |
containers []string |
| 16 | 16 |
} |
| 17 | 17 |
|
| 18 |
-// NewWaitCommand creats a new cobra.Command for `docker wait` |
|
| 18 |
+// NewWaitCommand creates a new cobra.Command for `docker wait` |
|
| 19 | 19 |
func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command {
|
| 20 | 20 |
var opts waitOptions |
| 21 | 21 |
|
| ... | ... |
@@ -110,7 +110,7 @@ func (cli *DockerCli) ConfigureAuth(flUser, flPassword, serverAddress string, is |
| 110 | 110 |
|
| 111 | 111 |
if flUser = strings.TrimSpace(flUser); flUser == "" {
|
| 112 | 112 |
if isDefaultRegistry {
|
| 113 |
- // if this is a defauly registry (docker hub), then display the following message. |
|
| 113 |
+ // if this is a default registry (docker hub), then display the following message. |
|
| 114 | 114 |
fmt.Fprintln(cli.out, "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.") |
| 115 | 115 |
} |
| 116 | 116 |
cli.promptWithDefault("Username", authconfig.Username)
|
| ... | ... |
@@ -134,7 +134,7 @@ func CopyToFile(outfile string, r io.Reader) error {
|
| 134 | 134 |
return nil |
| 135 | 135 |
} |
| 136 | 136 |
|
| 137 |
-// ForwardAllSignals forwards signals to the contianer |
|
| 137 |
+// ForwardAllSignals forwards signals to the container |
|
| 138 | 138 |
// TODO: this can be unexported again once all container commands are under |
| 139 | 139 |
// api/client/container |
| 140 | 140 |
func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal {
|
| ... | ... |
@@ -163,7 +163,7 @@ func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, er |
| 163 | 163 |
// events issues a call to the events API and returns a channel with all |
| 164 | 164 |
// events. The stream of events can be shutdown by cancelling the context. |
| 165 | 165 |
// |
| 166 |
-// A chan struct{} is returned that will be closed if the event procressing
|
|
| 166 |
+// A chan struct{} is returned that will be closed if the event processing
|
|
| 167 | 167 |
// fails and needs to be restarted. |
| 168 | 168 |
func (c *containerAdapter) wait(ctx context.Context) error {
|
| 169 | 169 |
return c.backend.ContainerWaitWithContext(ctx, c.container.name()) |
| ... | ... |
@@ -459,7 +459,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c |
| 459 | 459 |
userMounts[m.Destination] = struct{}{}
|
| 460 | 460 |
} |
| 461 | 461 |
|
| 462 |
- // Filter out mounts that are overriden by user supplied mounts |
|
| 462 |
+ // Filter out mounts that are overridden by user supplied mounts |
|
| 463 | 463 |
var defaultMounts []specs.Mount |
| 464 | 464 |
_, mountDev := userMounts["/dev"] |
| 465 | 465 |
for _, m := range s.Mounts {
|
| ... | ... |
@@ -25,7 +25,7 @@ weight = 1 |
| 25 | 25 |
|
| 26 | 26 |
### Docker for Mac |
| 27 | 27 |
|
| 28 |
-Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses <a href="https://github.com/mist64/xhyve/" target="_blank">xhyve</a> to virutalize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. |
|
| 28 |
+Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses <a href="https://github.com/mist64/xhyve/" target="_blank">xhyve</a> to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. |
|
| 29 | 29 |
|
| 30 | 30 |
<a class="button" href="https://download.docker.com/mac/beta/Docker.dmg">Get Docker for Mac</a> |
| 31 | 31 |
|
| ... | ... |
@@ -47,7 +47,7 @@ See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docke |
| 47 | 47 |
|
| 48 | 48 |
### Docker for Windows |
| 49 | 49 |
|
| 50 |
-Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virutalize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. |
|
| 50 |
+Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. |
|
| 51 | 51 |
|
| 52 | 52 |
<a class="button" href="https://download.docker.com/win/beta/InstallDocker.msi">Get Docker for Windows</a> |
| 53 | 53 |
|
| ... | ... |
@@ -126,7 +126,7 @@ To generate your access token: |
| 126 | 126 |
default - virtualbox Running tcp://192.168.99.100:2376 |
| 127 | 127 |
docker-sandbox * digitalocean Running tcp://45.55.222.72:2376 |
| 128 | 128 |
|
| 129 |
-6. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip <machine>` gets the host IP adddress and `docker-machine inspect <machine>` lists all the details. |
|
| 129 |
+6. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip <machine>` gets the host IP address and `docker-machine inspect <machine>` lists all the details. |
|
| 130 | 130 |
|
| 131 | 131 |
$ docker-machine ip docker-sandbox |
| 132 | 132 |
104.131.43.236 |
| ... | ... |
@@ -28,7 +28,7 @@ run your manager node. For example, the tutorial uses a machine named |
| 28 | 28 |
helloworld |
| 29 | 29 |
``` |
| 30 | 30 |
|
| 31 |
-3. Run `docker service inspect <SERVICE-ID>` to veriy that the swarm manager |
|
| 31 |
+3. Run `docker service inspect <SERVICE-ID>` to verify that the swarm manager |
|
| 32 | 32 |
removed the service. The CLI returns a message that the service is not found: |
| 33 | 33 |
|
| 34 | 34 |
``` |
| ... | ... |
@@ -2408,7 +2408,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
|
| 2408 | 2408 |
out, err := s.d.Cmd("run", "--rm", "busybox", "ls")
|
| 2409 | 2409 |
c.Assert(err, check.IsNil, check.Commentf(out)) |
| 2410 | 2410 |
|
| 2411 |
- // Run with default runtime explicitely |
|
| 2411 |
+ // Run with default runtime explicitly |
|
| 2412 | 2412 |
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
|
| 2413 | 2413 |
c.Assert(err, check.IsNil, check.Commentf(out)) |
| 2414 | 2414 |
|
| ... | ... |
@@ -2491,7 +2491,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
|
| 2491 | 2491 |
c.Assert(err, check.NotNil, check.Commentf(out)) |
| 2492 | 2492 |
c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") |
| 2493 | 2493 |
|
| 2494 |
- // Run with default runtime explicitely |
|
| 2494 |
+ // Run with default runtime explicitly |
|
| 2495 | 2495 |
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
|
| 2496 | 2496 |
c.Assert(err, check.IsNil, check.Commentf(out)) |
| 2497 | 2497 |
} |
| ... | ... |
@@ -2504,7 +2504,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
|
| 2504 | 2504 |
out, err := s.d.Cmd("run", "--rm", "busybox", "ls")
|
| 2505 | 2505 |
c.Assert(err, check.IsNil, check.Commentf(out)) |
| 2506 | 2506 |
|
| 2507 |
- // Run with default runtime explicitely |
|
| 2507 |
+ // Run with default runtime explicitly |
|
| 2508 | 2508 |
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
|
| 2509 | 2509 |
c.Assert(err, check.IsNil, check.Commentf(out)) |
| 2510 | 2510 |
|
| ... | ... |
@@ -2553,7 +2553,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
|
| 2553 | 2553 |
c.Assert(err, check.NotNil, check.Commentf(out)) |
| 2554 | 2554 |
c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") |
| 2555 | 2555 |
|
| 2556 |
- // Run with default runtime explicitely |
|
| 2556 |
+ // Run with default runtime explicitly |
|
| 2557 | 2557 |
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
|
| 2558 | 2558 |
c.Assert(err, check.IsNil, check.Commentf(out)) |
| 2559 | 2559 |
} |
| ... | ... |
@@ -51,7 +51,7 @@ var ( |
| 51 | 51 |
// greater than the 125 max. |
| 52 | 52 |
ErrMaxDepthExceeded = errors.New("max depth exceeded")
|
| 53 | 53 |
|
| 54 |
- // ErrNotSupported is used when the action is not supppoted |
|
| 54 |
+ // ErrNotSupported is used when the action is not supported |
|
| 55 | 55 |
// on the current platform |
| 56 | 56 |
ErrNotSupported = errors.New("not support on this platform")
|
| 57 | 57 |
) |
| ... | ... |
@@ -100,7 +100,7 @@ const ( |
| 100 | 100 |
) |
| 101 | 101 |
|
| 102 | 102 |
const ( |
| 103 |
- // AUFSWhiteoutFormat is the default format for whitesouts |
|
| 103 |
+ // AUFSWhiteoutFormat is the default format for whiteouts |
|
| 104 | 104 |
AUFSWhiteoutFormat WhiteoutFormat = iota |
| 105 | 105 |
// OverlayWhiteoutFormat formats whiteout according to the overlay |
| 106 | 106 |
// standard. |
| ... | ... |
@@ -65,7 +65,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped |
| 65 | 65 |
if rm.active {
|
| 66 | 66 |
return false, nil, fmt.Errorf("invalid call on active restartmanager")
|
| 67 | 67 |
} |
| 68 |
- // if the container ran for more than 10s, reguardless of status and policy reset the |
|
| 68 |
+ // if the container ran for more than 10s, regardless of status and policy reset the |
|
| 69 | 69 |
// the timeout back to the default. |
| 70 | 70 |
if executionDuration.Seconds() >= 10 {
|
| 71 | 71 |
rm.timeout = 0 |