Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
Kazuhiro Sera authored on 2018/08/09 00:45:00... | ... |
@@ -35,7 +35,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list |
35 | 35 |
FROM base AS criu |
36 | 36 |
# Install CRIU for checkpoint/restore support |
37 | 37 |
ENV CRIU_VERSION 3.6 |
38 |
-# Install dependancy packages specific to criu |
|
38 |
+# Install dependency packages specific to criu |
|
39 | 39 |
RUN apt-get update && apt-get install -y \ |
40 | 40 |
libnet-dev \ |
41 | 41 |
libprotobuf-c0-dev \ |
... | ... |
@@ -162,7 +162,7 @@ |
162 | 162 |
|
163 | 163 |
# Alexander Morozov contributed many features to Docker, worked on the premise of |
164 | 164 |
# what later became containerd (and worked on that too), and made a "stupid" Go |
165 |
- # vendor tool specificaly for docker/docker needs: vndr (https://github.com/LK4D4/vndr). |
|
165 |
+ # vendor tool specifically for docker/docker needs: vndr (https://github.com/LK4D4/vndr). |
|
166 | 166 |
# Not many know that Alexander is a master negotiator, being able to change course |
167 | 167 |
# of action with a single "Nope, we're not gonna do that". |
168 | 168 |
"lk4d4", |
... | ... |
@@ -374,7 +374,7 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) { |
374 | 374 |
childrenHandler := images.ChildrenHandler(p.is.ContentStore) |
375 | 375 |
// Set any children labels for that content |
376 | 376 |
childrenHandler = images.SetChildrenLabels(p.is.ContentStore, childrenHandler) |
377 |
- // Filter the childen by the platform |
|
377 |
+ // Filter the children by the platform |
|
378 | 378 |
childrenHandler = images.FilterPlatforms(childrenHandler, platforms.Default()) |
379 | 379 |
|
380 | 380 |
handlers = append(handlers, |
... | ... |
@@ -321,7 +321,7 @@ func (daemon *Daemon) cleanupSecretDir(c *container.Container) { |
321 | 321 |
logrus.WithError(err).WithField("container", c.ID).Warn("error getting secrets mount path for container") |
322 | 322 |
} |
323 | 323 |
if err := mount.RecursiveUnmount(dir); err != nil { |
324 |
- logrus.WithField("dir", dir).WithError(err).Warn("Error while attmepting to unmount dir, this may prevent removal of container.") |
|
324 |
+ logrus.WithField("dir", dir).WithError(err).Warn("Error while attempting to unmount dir, this may prevent removal of container.") |
|
325 | 325 |
} |
326 | 326 |
if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) { |
327 | 327 |
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 |
462 | 462 |
} |
463 | 463 |
|
464 | 464 |
// Copy all mounts from spec to defaultMounts, except for |
465 |
- // - mounts overriden by a user supplied mount; |
|
465 |
+ // - mounts overridden by a user supplied mount; |
|
466 | 466 |
// - all mounts under /dev if a user supplied /dev is present; |
467 | 467 |
// - /dev/shm, in case IpcMode is none. |
468 | 468 |
// While at it, also |
... | ... |
@@ -539,7 +539,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c |
539 | 539 |
case mount.SLAVE, mount.RSLAVE: |
540 | 540 |
var fallback bool |
541 | 541 |
if err := ensureSharedOrSlave(m.Source); err != nil { |
542 |
- // For backwards compatability purposes, treat mounts from the daemon root |
|
542 |
+ // For backwards compatibility purposes, treat mounts from the daemon root |
|
543 | 543 |
// as special since we automatically add rslave propagation to these mounts |
544 | 544 |
// when the user did not set anything, so we should fallback to the old |
545 | 545 |
// behavior which is to use private propagation which is normally the |
... | ... |
@@ -316,7 +316,7 @@ func (daemon *Daemon) reloadNetworkDiagnosticPort(conf *config.Config, attribute |
316 | 316 |
} |
317 | 317 |
return nil |
318 | 318 |
} |
319 |
- // Enable the network diagnostic if the flag is set with a valid port withing the range |
|
319 |
+ // Enable the network diagnostic if the flag is set with a valid port within the range |
|
320 | 320 |
logrus.WithFields(logrus.Fields{"port": conf.NetworkDiagnosticPort, "ip": "127.0.0.1"}).Warn("Starting network diagnostic server") |
321 | 321 |
daemon.netController.StartDiagnostic(conf.NetworkDiagnosticPort) |
322 | 322 |
|
... | ... |
@@ -10,7 +10,7 @@ import ( |
10 | 10 |
|
11 | 11 |
// validateBindDaemonRoot ensures that if a given mountpoint's source is within |
12 | 12 |
// the daemon root path, that the propagation is setup to prevent a container |
13 |
-// from holding private refereneces to a mount within the daemon root, which |
|
13 |
+// from holding private references to a mount within the daemon root, which |
|
14 | 14 |
// can cause issues when the daemon attempts to remove the mountpoint. |
15 | 15 |
func (daemon *Daemon) validateBindDaemonRoot(m mount.Mount) (bool, error) { |
16 | 16 |
if m.Type != mount.TypeBind { |
... | ... |
@@ -26,11 +26,11 @@ func TestNotFound(t *testing.T) { |
26 | 26 |
|
27 | 27 |
func TestConflict(t *testing.T) { |
28 | 28 |
if IsConflict(errTest) { |
29 |
- t.Fatalf("did not expect conflcit error, got %T", errTest) |
|
29 |
+ t.Fatalf("did not expect conflict error, got %T", errTest) |
|
30 | 30 |
} |
31 | 31 |
e := Conflict(errTest) |
32 | 32 |
if !IsConflict(e) { |
33 |
- t.Fatalf("expected conflcit error, got: %T", e) |
|
33 |
+ t.Fatalf("expected conflict error, got: %T", e) |
|
34 | 34 |
} |
35 | 35 |
if cause := e.(causal).Cause(); cause != errTest { |
36 | 36 |
t.Fatalf("causual should be errTest, got: %v", cause) |
... | ... |
@@ -126,7 +126,7 @@ fi |
126 | 126 |
# test whether "libdevmapper.h" is new enough to support deferred remove |
127 | 127 |
# functionality. We favour libdm_dlsym_deferred_remove over |
128 | 128 |
# libdm_no_deferred_remove in dynamic cases because the binary could be shipped |
129 |
-# with a newer libdevmapper than the one it was built wih. |
|
129 |
+# with a newer libdevmapper than the one it was built with. |
|
130 | 130 |
if \ |
131 | 131 |
command -v gcc &> /dev/null \ |
132 | 132 |
&& ! ( 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 { |
63 | 63 |
Spec mounttypes.Mount |
64 | 64 |
|
65 | 65 |
// Some bind mounts should not be automatically created. |
66 |
- // (Some are auto-created for backwards-compatability) |
|
66 |
+ // (Some are auto-created for backwards-compatibility) |
|
67 | 67 |
// This is checked on the API but setting this here prevents race conditions. |
68 | 68 |
// where a bind dir existed during validation was removed before reaching the setup code. |
69 | 69 |
SkipMountpointCreation bool |