kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #23738 from psiclops/typos

Browse source 
Fix misspell typos
This commit is contained in:
Sven Dowideit 2016-06-22 11:56:13 +10:00 committed by GitHub
commit e76e52b38b
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/utils.go
View file

@ -134,7 +134,7 @@ func CopyToFile(outfile string, r io.Reader) error {
return nil return nil
} }
// ForwardAllSignals forwards signals to the contianer // ForwardAllSignals forwards signals to the container
// TODO: this can be unexported again once all container commands are under // TODO: this can be unexported again once all container commands are under
// api/client/container // api/client/container
func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal { func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal {

4
daemon/cluster/executor/container/adapter.go
View file

@ -70,7 +70,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error {
} }
return err return err
} }
// TOOD(stevvooe): Report this status somewhere. // TODO(stevvooe): Report this status somewhere.
logrus.Debugln("pull progress", m) logrus.Debugln("pull progress", m)
} }
// if the final stream object contained an error, return it // if the final stream object contained an error, return it
@ -126,7 +126,7 @@ func (c *containerAdapter) create(ctx context.Context, backend executorpkg.Backe
return err return err
} }
// Docker daemon currently doesnt support multiple networks in container create // Docker daemon currently doesn't support multiple networks in container create
// Connect to all other networks // Connect to all other networks
nc := c.container.connectNetworkingConfig() nc := c.container.connectNetworkingConfig()

2
daemon/cluster/executor/container/container.go
View file

@ -19,7 +19,7 @@ import (
) )
const ( const (
// Explictly use the kernel's default setting for CPU quota of 100ms. // Explicitly use the kernel's default setting for CPU quota of 100ms.
// https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt // https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
cpuQuotaPeriod = 100 * time.Millisecond cpuQuotaPeriod = 100 * time.Millisecond

2
daemon/cluster/provider/network.go
View file

@ -13,7 +13,7 @@ type NetworkCreateResponse struct {
ID string `json:"Id"` ID string `json:"Id"`
} }
// VirtualAddress represents a virtual adress. // VirtualAddress represents a virtual address.
type VirtualAddress struct { type VirtualAddress struct {
IPv4 string IPv4 string
IPv6 string IPv6 string

2
daemon/oci_linux.go
View file

@ -459,7 +459,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c
userMounts[m.Destination] = struct{}{} userMounts[m.Destination] = struct{}{}
} }
// Filter out mounts that are overriden by user supplied mounts // Filter out mounts that are overridden by user supplied mounts
var defaultMounts []specs.Mount var defaultMounts []specs.Mount
_, mountDev := userMounts["/dev"] _, mountDev := userMounts["/dev"]
for _, m := range s.Mounts { for _, m := range s.Mounts {

8
integration-cli/docker_cli_daemon_test.go
View file

@ -2408,7 +2408,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
out, err := s.d.Cmd("run", "--rm", "busybox", "ls") out, err := s.d.Cmd("run", "--rm", "busybox", "ls")
c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(err, check.IsNil, check.Commentf(out))
// Run with default runtime explicitely // Run with default runtime explicitly
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(err, check.IsNil, check.Commentf(out))
@ -2491,7 +2491,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
c.Assert(err, check.NotNil, check.Commentf(out)) c.Assert(err, check.NotNil, check.Commentf(out))
c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")
// Run with default runtime explicitely // Run with default runtime explicitly
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(err, check.IsNil, check.Commentf(out))
} }
@ -2504,7 +2504,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
out, err := s.d.Cmd("run", "--rm", "busybox", "ls") out, err := s.d.Cmd("run", "--rm", "busybox", "ls")
c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(err, check.IsNil, check.Commentf(out))
// Run with default runtime explicitely // Run with default runtime explicitly
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(err, check.IsNil, check.Commentf(out))
@ -2553,7 +2553,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
c.Assert(err, check.NotNil, check.Commentf(out)) c.Assert(err, check.NotNil, check.Commentf(out))
c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")
// Run with default runtime explicitely // Run with default runtime explicitly
out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls")
c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(err, check.IsNil, check.Commentf(out))
} }

2
plugin/distribution/push.go
View file

@ -97,7 +97,7 @@ func Push(name string, rs registry.Service, metaHeader http.Header, authConfig *
return "", err return "", err
} }
// The canonical descriptor is set the mediatype again, just in case. // The canonical descriptor is set the mediatype again, just in case.
// Dont touch the digest or the size here. // Don't touch the digest or the size here.
desc.MediaType = mt desc.MediaType = mt
logrus.Debugf("pushed blob: %s %s", desc.MediaType, desc.Digest) logrus.Debugf("pushed blob: %s %s", desc.MediaType, desc.Digest)
descs = append(descs, desc) descs = append(descs, desc)