Fix the several typos detected by github.com/client9/misspell
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
This commit is contained in:
parent
f57f260b49
commit
1e49fdcafc
10 changed files with 12 additions and 12 deletions
|
@ -35,7 +35,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
|
||||||
FROM base AS criu
|
FROM base AS criu
|
||||||
# Install CRIU for checkpoint/restore support
|
# Install CRIU for checkpoint/restore support
|
||||||
ENV CRIU_VERSION 3.6
|
ENV CRIU_VERSION 3.6
|
||||||
# Install dependancy packages specific to criu
|
# Install dependency packages specific to criu
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
libnet-dev \
|
libnet-dev \
|
||||||
libprotobuf-c0-dev \
|
libprotobuf-c0-dev \
|
||||||
|
|
|
@ -162,7 +162,7 @@
|
||||||
|
|
||||||
# Alexander Morozov contributed many features to Docker, worked on the premise of
|
# Alexander Morozov contributed many features to Docker, worked on the premise of
|
||||||
# what later became containerd (and worked on that too), and made a "stupid" Go
|
# what later became containerd (and worked on that too), and made a "stupid" Go
|
||||||
# vendor tool specificaly for docker/docker needs: vndr (https://github.com/LK4D4/vndr).
|
# vendor tool specifically for docker/docker needs: vndr (https://github.com/LK4D4/vndr).
|
||||||
# Not many know that Alexander is a master negotiator, being able to change course
|
# Not many know that Alexander is a master negotiator, being able to change course
|
||||||
# of action with a single "Nope, we're not gonna do that".
|
# of action with a single "Nope, we're not gonna do that".
|
||||||
"lk4d4",
|
"lk4d4",
|
||||||
|
|
|
@ -374,7 +374,7 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
|
||||||
childrenHandler := images.ChildrenHandler(p.is.ContentStore)
|
childrenHandler := images.ChildrenHandler(p.is.ContentStore)
|
||||||
// Set any children labels for that content
|
// Set any children labels for that content
|
||||||
childrenHandler = images.SetChildrenLabels(p.is.ContentStore, childrenHandler)
|
childrenHandler = images.SetChildrenLabels(p.is.ContentStore, childrenHandler)
|
||||||
// Filter the childen by the platform
|
// Filter the children by the platform
|
||||||
childrenHandler = images.FilterPlatforms(childrenHandler, platforms.Default())
|
childrenHandler = images.FilterPlatforms(childrenHandler, platforms.Default())
|
||||||
|
|
||||||
handlers = append(handlers,
|
handlers = append(handlers,
|
||||||
|
|
|
@ -321,7 +321,7 @@ func (daemon *Daemon) cleanupSecretDir(c *container.Container) {
|
||||||
logrus.WithError(err).WithField("container", c.ID).Warn("error getting secrets mount path for container")
|
logrus.WithError(err).WithField("container", c.ID).Warn("error getting secrets mount path for container")
|
||||||
}
|
}
|
||||||
if err := mount.RecursiveUnmount(dir); err != nil {
|
if err := mount.RecursiveUnmount(dir); err != nil {
|
||||||
logrus.WithField("dir", dir).WithError(err).Warn("Error while attmepting to unmount dir, this may prevent removal of container.")
|
logrus.WithField("dir", dir).WithError(err).Warn("Error while attempting to unmount dir, this may prevent removal of container.")
|
||||||
}
|
}
|
||||||
if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
|
if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
|
||||||
logrus.WithField("dir", dir).WithError(err).Error("Error removing dir.")
|
logrus.WithField("dir", dir).WithError(err).Error("Error removing dir.")
|
||||||
|
|
|
@ -462,7 +462,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy all mounts from spec to defaultMounts, except for
|
// Copy all mounts from spec to defaultMounts, except for
|
||||||
// - mounts overriden by a user supplied mount;
|
// - mounts overridden by a user supplied mount;
|
||||||
// - all mounts under /dev if a user supplied /dev is present;
|
// - all mounts under /dev if a user supplied /dev is present;
|
||||||
// - /dev/shm, in case IpcMode is none.
|
// - /dev/shm, in case IpcMode is none.
|
||||||
// While at it, also
|
// While at it, also
|
||||||
|
@ -539,7 +539,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c
|
||||||
case mount.SLAVE, mount.RSLAVE:
|
case mount.SLAVE, mount.RSLAVE:
|
||||||
var fallback bool
|
var fallback bool
|
||||||
if err := ensureSharedOrSlave(m.Source); err != nil {
|
if err := ensureSharedOrSlave(m.Source); err != nil {
|
||||||
// For backwards compatability purposes, treat mounts from the daemon root
|
// For backwards compatibility purposes, treat mounts from the daemon root
|
||||||
// as special since we automatically add rslave propagation to these mounts
|
// as special since we automatically add rslave propagation to these mounts
|
||||||
// when the user did not set anything, so we should fallback to the old
|
// when the user did not set anything, so we should fallback to the old
|
||||||
// behavior which is to use private propagation which is normally the
|
// behavior which is to use private propagation which is normally the
|
||||||
|
|
|
@ -316,7 +316,7 @@ func (daemon *Daemon) reloadNetworkDiagnosticPort(conf *config.Config, attribute
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// Enable the network diagnostic if the flag is set with a valid port withing the range
|
// Enable the network diagnostic if the flag is set with a valid port within the range
|
||||||
logrus.WithFields(logrus.Fields{"port": conf.NetworkDiagnosticPort, "ip": "127.0.0.1"}).Warn("Starting network diagnostic server")
|
logrus.WithFields(logrus.Fields{"port": conf.NetworkDiagnosticPort, "ip": "127.0.0.1"}).Warn("Starting network diagnostic server")
|
||||||
daemon.netController.StartDiagnostic(conf.NetworkDiagnosticPort)
|
daemon.netController.StartDiagnostic(conf.NetworkDiagnosticPort)
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
|
|
||||||
// validateBindDaemonRoot ensures that if a given mountpoint's source is within
|
// validateBindDaemonRoot ensures that if a given mountpoint's source is within
|
||||||
// the daemon root path, that the propagation is setup to prevent a container
|
// the daemon root path, that the propagation is setup to prevent a container
|
||||||
// from holding private refereneces to a mount within the daemon root, which
|
// from holding private references to a mount within the daemon root, which
|
||||||
// can cause issues when the daemon attempts to remove the mountpoint.
|
// can cause issues when the daemon attempts to remove the mountpoint.
|
||||||
func (daemon *Daemon) validateBindDaemonRoot(m mount.Mount) (bool, error) {
|
func (daemon *Daemon) validateBindDaemonRoot(m mount.Mount) (bool, error) {
|
||||||
if m.Type != mount.TypeBind {
|
if m.Type != mount.TypeBind {
|
||||||
|
|
|
@ -26,11 +26,11 @@ func TestNotFound(t *testing.T) {
|
||||||
|
|
||||||
func TestConflict(t *testing.T) {
|
func TestConflict(t *testing.T) {
|
||||||
if IsConflict(errTest) {
|
if IsConflict(errTest) {
|
||||||
t.Fatalf("did not expect conflcit error, got %T", errTest)
|
t.Fatalf("did not expect conflict error, got %T", errTest)
|
||||||
}
|
}
|
||||||
e := Conflict(errTest)
|
e := Conflict(errTest)
|
||||||
if !IsConflict(e) {
|
if !IsConflict(e) {
|
||||||
t.Fatalf("expected conflcit error, got: %T", e)
|
t.Fatalf("expected conflict error, got: %T", e)
|
||||||
}
|
}
|
||||||
if cause := e.(causal).Cause(); cause != errTest {
|
if cause := e.(causal).Cause(); cause != errTest {
|
||||||
t.Fatalf("causual should be errTest, got: %v", cause)
|
t.Fatalf("causual should be errTest, got: %v", cause)
|
||||||
|
|
|
@ -126,7 +126,7 @@ fi
|
||||||
# test whether "libdevmapper.h" is new enough to support deferred remove
|
# test whether "libdevmapper.h" is new enough to support deferred remove
|
||||||
# functionality. We favour libdm_dlsym_deferred_remove over
|
# functionality. We favour libdm_dlsym_deferred_remove over
|
||||||
# libdm_no_deferred_remove in dynamic cases because the binary could be shipped
|
# libdm_no_deferred_remove in dynamic cases because the binary could be shipped
|
||||||
# with a newer libdevmapper than the one it was built wih.
|
# with a newer libdevmapper than the one it was built with.
|
||||||
if \
|
if \
|
||||||
command -v gcc &> /dev/null \
|
command -v gcc &> /dev/null \
|
||||||
&& ! ( echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null $(pkg-config --libs devmapper) &> /dev/null ) \
|
&& ! ( echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null $(pkg-config --libs devmapper) &> /dev/null ) \
|
||||||
|
|
|
@ -63,7 +63,7 @@ type MountPoint struct {
|
||||||
Spec mounttypes.Mount
|
Spec mounttypes.Mount
|
||||||
|
|
||||||
// Some bind mounts should not be automatically created.
|
// Some bind mounts should not be automatically created.
|
||||||
// (Some are auto-created for backwards-compatability)
|
// (Some are auto-created for backwards-compatibility)
|
||||||
// This is checked on the API but setting this here prevents race conditions.
|
// This is checked on the API but setting this here prevents race conditions.
|
||||||
// where a bind dir existed during validation was removed before reaching the setup code.
|
// where a bind dir existed during validation was removed before reaching the setup code.
|
||||||
SkipMountpointCreation bool
|
SkipMountpointCreation bool
|
||||||
|
|
Loading…
Reference in a new issue