aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/podman/commit.go2
-rw-r--r--cmd/podman/create.go2
-rw-r--r--cmd/podman/import.go2
-rw-r--r--cmd/podman/inspect.go2
-rw-r--r--cmd/podman/pull.go2
-rw-r--r--cmd/podman/run_test.go6
-rw-r--r--cmd/podman/varlink/io.projectatomic.podman.varlink16
-rw-r--r--contrib/python/podman/libs/containers.py6
-rw-r--r--libpod/boltdb_state_internal.go2
-rw-r--r--libpod/container_attach.go2
-rw-r--r--libpod/container_internal.go2
-rw-r--r--libpod/image/filters.go2
-rw-r--r--libpod/image/utils.go2
-rw-r--r--libpod/info.go2
-rw-r--r--libpod/runtime.go2
-rw-r--r--libpod/state.go2
-rw-r--r--pkg/annotations/annotations.go2
-rw-r--r--pkg/registries/registries.go2
-rw-r--r--pkg/secrets/secrets.go2
-rw-r--r--pkg/spec/ports.go2
-rw-r--r--pkg/varlinkapi/containers.go2
-rw-r--r--test/e2e/libpod_suite_test.go2
-rw-r--r--test/e2e/push_test.go2
-rw-r--r--test/e2e/rmi_test.go2
24 files changed, 35 insertions, 35 deletions
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index 9e468c2d9..ce8e99dd4 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -32,7 +32,7 @@ var (
},
cli.StringFlag{
Name: "author, a",
- Usage: "Set the author for the image comitted",
+ Usage: "Set the author for the image committed",
},
cli.BoolTFlag{
Name: "pause, p",
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 293762ff3..88e717f39 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -418,7 +418,7 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim
return nil, err
}
- // SHM SIze
+ // SHM Size
shmSize, err := units.FromHumanSize(c.String("shm-size"))
if err != nil {
return nil, errors.Wrapf(err, "unable to translate --shm-size")
diff --git a/cmd/podman/import.go b/cmd/podman/import.go
index 446516024..c2bcc8f5b 100644
--- a/cmd/podman/import.go
+++ b/cmd/podman/import.go
@@ -120,7 +120,7 @@ func importCmd(c *cli.Context) error {
}
// donwloadFromURL downloads an image in the format "https:/example.com/myimage.tar"
-// and tempoarily saves in it /var/tmp/importxyz, which is deleted after the image is imported
+// and temporarily saves in it /var/tmp/importxyz, which is deleted after the image is imported
func downloadFromURL(source string) (string, error) {
fmt.Printf("Downloading from %q\n", source)
diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go
index abc9cfb39..55c319d7d 100644
--- a/cmd/podman/inspect.go
+++ b/cmd/podman/inspect.go
@@ -60,7 +60,7 @@ func inspectCmd(c *cli.Context) error {
}
if len(args) > 0 && latestContainer {
- return errors.Errorf("you cannot provide additional arguements with --latest")
+ return errors.Errorf("you cannot provide additional arguments with --latest")
}
if err := validateFlags(c, inspectFlags); err != nil {
return err
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
index 0712283c3..521492dc5 100644
--- a/cmd/podman/pull.go
+++ b/cmd/podman/pull.go
@@ -109,7 +109,7 @@ func pullCmd(c *cli.Context) error {
return errors.Wrapf(err, "error pulling image %q", image)
}
- // Intentially choosing to ignore if there is an error because
+ // Intentionally choosing to ignore if there is an error because
// outputting the image ID is a NTH and not integral to the pull
fmt.Println(newImage.ID())
return nil
diff --git a/cmd/podman/run_test.go b/cmd/podman/run_test.go
index e2d500187..93e42f5bd 100644
--- a/cmd/podman/run_test.go
+++ b/cmd/podman/run_test.go
@@ -88,7 +88,7 @@ func getRuntimeSpec(c *cli.Context) (*spec.Spec, error) {
return runtimeSpec, nil
}
-// TestPIDsLimit verifies the inputed pid-limit is correctly defined in the spec
+// TestPIDsLimit verifies the inputted pid-limit is correctly defined in the spec
func TestPIDsLimit(t *testing.T) {
a := createCLI()
args := []string{"--pids-limit", "22"}
@@ -100,7 +100,7 @@ func TestPIDsLimit(t *testing.T) {
assert.Equal(t, runtimeSpec.Linux.Resources.Pids.Limit, int64(22))
}
-// TestBLKIOWeightDevice verifies the inputed blkio weigh device is correctly defined in the spec
+// TestBLKIOWeightDevice verifies the inputted blkio weigh device is correctly defined in the spec
func TestBLKIOWeightDevice(t *testing.T) {
a := createCLI()
args := []string{"--blkio-weight-device", "/dev/zero:100"}
@@ -112,7 +112,7 @@ func TestBLKIOWeightDevice(t *testing.T) {
assert.Equal(t, *runtimeSpec.Linux.Resources.BlockIO.WeightDevice[0].Weight, uint16(100))
}
-// TestMemorySwap verifies that the inputed memory swap is correctly defined in the spec
+// TestMemorySwap verifies that the inputted memory swap is correctly defined in the spec
func TestMemorySwap(t *testing.T) {
a := createCLI()
args := []string{"--memory-swap", "45m", "--memory", "40m"}
diff --git a/cmd/podman/varlink/io.projectatomic.podman.varlink b/cmd/podman/varlink/io.projectatomic.podman.varlink
index 6583065e9..f7b54cf1c 100644
--- a/cmd/podman/varlink/io.projectatomic.podman.varlink
+++ b/cmd/podman/varlink/io.projectatomic.podman.varlink
@@ -51,7 +51,7 @@ type ImageHistory (
)
# ImageSearch is the returned structure for SearchImage. It is returned
-# in arrary form.
+# in array form.
type ImageSearch (
description: string,
is_official: bool,
@@ -330,7 +330,7 @@ method InspectContainer(name: string) -> (container: string)
# ListContainerProcesses takes a name or ID of a container and returns the processes
# running inside the container as array of strings. It will accept an array of string
-# arguements that represent ps options. If the container cannot be found, a [ContainerNotFound](#ContainerNotFound)
+# arguments that represent ps options. If the container cannot be found, a [ContainerNotFound](#ContainerNotFound)
# error will be returned.
# #### Example
# ~~~
@@ -398,7 +398,7 @@ method ResizeContainerTty() -> (notimplemented: NotImplemented)
method StartContainer(name: string) -> (container: string)
# StopContainer stops a container given a timeout. It takes the name or ID of a container as well as a
-# timeout value. The timeout value the time before a forceable stop to the container is applied. It
+# timeout value. The timeout value the time before a forcible stop to the container is applied. It
# returns the container ID once stopped. If the container cannot be found, a [ContainerNotFound](#ContainerNotFound)
# error will be returned instead. See also [KillContainer](KillContainer).
# #### Error
@@ -411,7 +411,7 @@ method StartContainer(name: string) -> (container: string)
method StopContainer(name: string, timeout: int) -> (container: string)
# RestartContainer will restart a running container given a container name or ID and timeout value. The timeout
-# value is the time before a forceable stop is used to stop the container. If the container cannot be found by
+# value is the time before a forcible stop is used to stop the container. If the container cannot be found by
# name or ID, a [ContainerNotFound](#ContainerNotFound) error will be returned; otherwise, the ID of the
# container will be returned.
method RestartContainer(name: string, timeout: int) -> (container: string)
@@ -463,7 +463,7 @@ method GetAttachSockets(name: string) -> (sockets: Sockets)
method WaitContainer(name: string) -> (exitcode: int)
# RemoveContainer takes requires the name or ID of container as well a boolean representing whether a running
-# container can be stopped and removed. Upon sucessful removal of the container, its ID is returned. If the
+# container can be stopped and removed. Upon successful removal of the container, its ID is returned. If the
# container cannot be found by name or ID, a [ContainerNotFound](#ContainerNotFound) error will be returned.
# #### Example
# ~~~
@@ -479,7 +479,7 @@ method RemoveContainer(name: string, force: bool) -> (container: string)
method DeleteStoppedContainers() -> (containers: []string)
# ListImages returns an array of ImageInList structures which provide basic information about
-# an image currenly in storage. See also [InspectImage](InspectImage).
+# an image currently in storage. See also [InspectImage](InspectImage).
method ListImages() -> (images: []ImageInList)
# This function is not implemented yet.
@@ -507,7 +507,7 @@ method PushImage(name: string, tag: string, tlsverify: bool) -> (image: string)
# be found, an [ImageNotFound](#ImageNotFound) error will be returned; otherwise, the ID of the image is returned on success.
method TagImage(name: string, tagged: string) -> (image: string)
-# RemoveImage takes the name or ID of an image as well as a booleon that determines if containers using that image
+# RemoveImage takes the name or ID of an image as well as a boolean that determines if containers using that image
# should be deleted. If the image cannot be found, an [ImageNotFound](#ImageNotFound) error will be returned. The
# ID of the removed image is returned when complete. See also [DeleteUnusedImages](DeleteUnusedImages).
# #### Example
@@ -542,7 +542,7 @@ method Commit(name: string, image_name: string, changes: []string, author: strin
method ImportImage(source: string, reference: string, message: string, changes: []string) -> (image: string)
# ExportImage takes the name or ID of an image and exports it to a destination like a tarball. There is also
-# a booleon option to force compression. Upon completion, the ID of the image is returned. If the image cannot
+# a boolean option to force compression. Upon completion, the ID of the image is returned. If the image cannot
# be found in local storage, an [ImageNotFound](#ImageNotFound) error will be returned. See also [ImportImage](ImportImage).
method ExportImage(name: string, destination: string, compress: bool) -> (image: string)
diff --git a/contrib/python/podman/libs/containers.py b/contrib/python/podman/libs/containers.py
index 0655010f1..04ea76180 100644
--- a/contrib/python/podman/libs/containers.py
+++ b/contrib/python/podman/libs/containers.py
@@ -42,7 +42,7 @@ class Container(collections.UserDict):
def attach(self, detach_key=None, no_stdin=False, sig_proxy=True):
"""Attach to running container."""
with self._client() as podman:
- # TODO: streaming and port magic occur, need arguements
+ # TODO: streaming and port magic occur, need arguments
podman.AttachToContainer()
def processes(self):
@@ -163,7 +163,7 @@ class Container(collections.UserDict):
def rename(self, target):
"""Rename container, return id on success."""
with self._client() as podman:
- # TODO: Need arguements
+ # TODO: Need arguments
results = podman.RenameContainer()
# TODO: fixup objects cached information
return results['container']
@@ -171,7 +171,7 @@ class Container(collections.UserDict):
def resize_tty(self, width, height):
"""Resize container tty."""
with self._client() as podman:
- # TODO: magic re: attach(), arguements
+ # TODO: magic re: attach(), arguments
podman.ResizeContainerTty()
def pause(self):
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
diff --git a/pkg/annotations/annotations.go b/pkg/annotations/annotations.go
index 151d93904..008cca7ee 100644
--- a/pkg/annotations/annotations.go
+++ b/pkg/annotations/annotations.go
@@ -79,7 +79,7 @@ const (
// StdinOnce is the stdin_once annotation
StdinOnce = "io.kubernetes.cri-o.StdinOnce"
- // Volumes is the volumes annotatoin
+ // Volumes is the volumes annotation
Volumes = "io.kubernetes.cri-o.Volumes"
)
diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go
index 8e43c8b91..844d2c415 100644
--- a/pkg/registries/registries.go
+++ b/pkg/registries/registries.go
@@ -22,7 +22,7 @@ func GetRegistries() ([]string, error) {
return searchRegistries, nil
}
-// GetInsecureRegistries obtains the list of inseure registries from the global registration file.
+// GetInsecureRegistries obtains the list of insecure registries from the global registration file.
func GetInsecureRegistries() ([]string, error) {
registryConfigPath := ""
envOverride := os.Getenv("REGISTRIES_CONFIG_PATH")
diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go
index 0e48c7a12..1b525de83 100644
--- a/pkg/secrets/secrets.go
+++ b/pkg/secrets/secrets.go
@@ -237,7 +237,7 @@ func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir, mountPr
return mounts, nil
}
-// addFIPSModeSecret creates /run/secrets/system-fips in the container
+// addFIPSsModeSecret creates /run/secrets/system-fips in the container
// root filesystem if /etc/system-fips exists on hosts.
// This enables the container to be FIPS compliant and run openssl in
// FIPS mode as the host is also in FIPS mode.
diff --git a/pkg/spec/ports.go b/pkg/spec/ports.go
index 4d9a625bf..bdd26bd83 100644
--- a/pkg/spec/ports.go
+++ b/pkg/spec/ports.go
@@ -36,7 +36,7 @@ func ExposedPorts(expose, publish []string, publishAll bool, imageExposedPorts m
}
}
- // parse user input'd port bindings
+ // parse user inputted port bindings
pbPorts, portBindings, err := nat.ParsePortSpecs(publish)
if err != nil {
return nil, err
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index 43ab3c995..2d3a731e9 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -273,7 +273,7 @@ func (i *LibpodAPI) StartContainer(call ioprojectatomicpodman.VarlinkCall, name
return call.ReplyErrorOccurred(err.Error())
}
if state == libpod.ContainerStateRunning || state == libpod.ContainerStatePaused {
- return call.ReplyErrorOccurred("container is alrady running or paused")
+ return call.ReplyErrorOccurred("container is already running or paused")
}
if err := ctr.Start(getContext()); err != nil {
return call.ReplyErrorOccurred(err.Error())
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 1383b5a19..7007c5075 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -254,7 +254,7 @@ func (s *PodmanSession) OutputToStringArray() []string {
return strings.Split(output, "\n")
}
-// IsJSONOutputValid attempts to unmarshall the session buffer
+// IsJSONOutputValid attempts to unmarshal the session buffer
// and if successful, returns true, else false
func (s *PodmanSession) IsJSONOutputValid() bool {
var i interface{}
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go
index b5a1002f2..3f559cc95 100644
--- a/test/e2e/push_test.go
+++ b/test/e2e/push_test.go
@@ -160,7 +160,7 @@ var _ = Describe("Podman push", func() {
defer podmanTest.SystemExec("systemctl", []string{"stop", "docker"})
} else if setup.ExitCode() != 0 {
- Skip("Docker is not avaiable")
+ Skip("Docker is not available")
}
session := podmanTest.Podman([]string{"push", ALPINE, "docker-daemon:alpine:podmantest"})
diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go
index 43fe84157..399fcd0fc 100644
--- a/test/e2e/rmi_test.go
+++ b/test/e2e/rmi_test.go
@@ -59,7 +59,7 @@ var _ = Describe("Podman rmi", func() {
})
- It("podman rmi all images forceably with short options", func() {
+ It("podman rmi all images forcibly with short options", func() {
podmanTest.PullImages([]string{image3})
session := podmanTest.Podman([]string{"rmi", "-fa"})
session.WaitWithDefaultTimeout()
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 06:05:33 +0000