diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/boltdb_state_internal.go | 2 | ||||
| -rw-r--r-- | libpod/container_attach.go | 2 | ||||
| -rw-r--r-- | libpod/container_internal.go | 2 | ||||
| -rw-r--r-- | libpod/image/filters.go | 2 | ||||
| -rw-r--r-- | libpod/image/utils.go | 2 | ||||
| -rw-r--r-- | libpod/info.go | 2 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 | ||||
| -rw-r--r-- | libpod/state.go | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 29ed42f1e..407d2758a 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -427,7 +427,7 @@ func (s *BoltState) addContainer(ctr *Container, pod *Pod) error { return errors.Wrapf(ErrInvalidArg, "container %s depends on container %s which is in a different pod (%s)", ctr.ID(), dependsCtr, string(depCtrPod)) } } else { - // If we're not part of a pod, we cannot depend on containets in a pod + // If we're not part of a pod, we cannot depend on containers in a pod if depCtrPod != nil { return errors.Wrapf(ErrInvalidArg, "container %s depends on container %s which is in a pod - containers not in pods cannot depend on containers in pods", ctr.ID(), dependsCtr) } diff --git a/libpod/container_attach.go b/libpod/container_attach.go index 65c878bff..fa09d1ca4 100644 --- a/libpod/container_attach.go +++ b/libpod/container_attach.go @@ -65,7 +65,7 @@ func (c *Container) attach(streams *AttachStreams, keys string, resize <-chan re } // attachContainerSocket connects to the container's attach socket and deals with the IO -// TODO add a channel to allow interruptiong +// TODO add a channel to allow interrupting func (c *Container) attachContainerSocket(resize <-chan remotecommand.TerminalSize, detachKeys []byte, streams *AttachStreams) error { kubeutils.HandleResizing(resize, func(size remotecommand.TerminalSize) { controlPath := filepath.Join(c.bundlePath(), "ctl") diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 9896d0ed7..258ee6ffd 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -83,7 +83,7 @@ func (c *Container) rootFsSize() (int64, error) { } } // Get the size of the last layer. Has to be outside of the loop - // because the parent of the last layer is "", andlstore.Get("") + // because the parent of the last layer is "", and lstore.Get("") // will return an error. layerSize, err := c.runtime.store.DiffSize(layer.Parent, layer.ID) return size + layerSize, err diff --git a/libpod/image/filters.go b/libpod/image/filters.go index c1dd1e5cd..95ef3b44a 100644 --- a/libpod/image/filters.go +++ b/libpod/image/filters.go @@ -67,7 +67,7 @@ func OutputImageFilter(userImage *Image) ResultFilter { } } -// FilterImages filters images using a set of predefined fitler funcs +// FilterImages filters images using a set of predefined filter funcs func FilterImages(images []*Image, filters []ResultFilter) []*Image { var filteredImages []*Image for _, image := range images { diff --git a/libpod/image/utils.go b/libpod/image/utils.go index c1b2aacde..5392b86f0 100644 --- a/libpod/image/utils.go +++ b/libpod/image/utils.go @@ -72,7 +72,7 @@ func getCopyOptions(reportWriter io.Writer, signaturePolicyPath string, srcDocke } } -// getPolicyContext sets up, intializes and returns a new context for the specified policy +// getPolicyContext sets up, initializes and returns a new context for the specified policy func getPolicyContext(ctx *types.SystemContext) (*signature.PolicyContext, error) { policy, err := signature.DefaultPolicy(ctx) if err != nil { diff --git a/libpod/info.go b/libpod/info.go index 03919eb1a..cc9d55553 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -38,7 +38,7 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) { kv, err := readKernelVersion() if err != nil { - return nil, errors.Wrapf(err, "error reading kernet version") + return nil, errors.Wrapf(err, "error reading kernel version") } info["kernel"] = kv diff --git a/libpod/runtime.go b/libpod/runtime.go index 5be0981ed..52a2653b3 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -589,7 +589,7 @@ func (r *Runtime) Info() ([]InfoData, error) { return info, nil } -// generateName generates a unigue name for a container or pod. +// generateName generates a unique name for a container or pod. func (r *Runtime) generateName() (string, error) { for { name := namesgenerator.GetRandomName(0) diff --git a/libpod/state.go b/libpod/state.go index 9333c1724..b71f811ea 100644 --- a/libpod/state.go +++ b/libpod/state.go @@ -56,7 +56,7 @@ type State interface { // Only empty pods can be removed from the state RemovePod(pod *Pod) error // Remove all containers from a pod - // Used to simulataneously remove containers that might otherwise have + // Used to simultaneously remove containers that might otherwise have // dependency issues // Will fail if a dependency outside the pod is encountered RemovePodContainers(pod *Pod) error |