diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/auth/auth_test.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/test/containers_test.go | 2 | ||||
| -rw-r--r-- | pkg/machine/wsl/machine.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/podspecgen.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/specgen.go | 4 | ||||
| -rw-r--r-- | pkg/specgenutil/specgen.go | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index 2c79f0b7c..f25cbf2cc 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -31,7 +31,7 @@ var largeAuthFileValues = map[string]types.DockerAuthConfig{ // systemContextForAuthFile returns a types.SystemContext with AuthFilePath pointing // to a temporary file with fileContents, or nil if fileContents is empty; and a cleanup -// function the calle rmust arrange to call. +// function the caller must arrange to call. func systemContextForAuthFile(t *testing.T, fileContents string) (*types.SystemContext, func()) { if fileContents == "" { return nil, func() {} diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index af2bad691..9411d8a5f 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -714,7 +714,7 @@ var _ = Describe("Podman containers ", func() { var name = "top" cid, err := bt.RunTopContainer(&name, nil) Expect(err).To(BeNil()) - // Forcably Removing running container should succeed + // Forcibly Removing running container should succeed rmResponse, err := containers.Remove(bt.conn, cid, new(containers.RemoveOptions).WithForce(true)) Expect(err).To(BeNil()) Expect(len(reports.RmReportsErrs(rmResponse))).To(Equal(0)) diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index c7d857954..3edf3ddf6 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -567,7 +567,7 @@ func installWslKernel() error { } // In case of unusual circumstances (e.g. race with installer actions) // retry a few times - message = "An error occured attempting the WSL Kernel update, retrying..." + message = "An error occurred attempting the WSL Kernel update, retrying..." fmt.Println(message) fmt.Fprintln(log, message) time.Sleep(backoff) diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 62b4725a7..91b2599cc 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -94,7 +94,7 @@ type PodNetworkConfig struct { // Only available if NetNS is set to Bridge or Slirp. // Optional. PortMappings []types.PortMapping `json:"portmappings,omitempty"` - // Map of networks names ot ids the container should join to. + // Map of networks names to ids the container should join to. // You can request additional settings for each network, you can // set network aliases, static ips, static mac address and the // network interface name for this container on the specific network. diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 750fc875d..7f6f79b87 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -223,7 +223,7 @@ type ContainerStorageConfig struct { // Conflicts with Image. // At least one of Image or Rootfs must be specified. Rootfs string `json:"rootfs,omitempty"` - // RootfsOverlay tells if rootfs is actuall an overlay on top of base path + // RootfsOverlay tells if rootfs is actually an overlay on top of base path RootfsOverlay bool `json:"rootfs_overlay,omitempty"` // ImageVolumeMode indicates how image volumes will be created. // Supported modes are "ignore" (do not create), "tmpfs" (create as @@ -423,7 +423,7 @@ type ContainerNetworkConfig struct { // PublishExposedPorts is set. // Optional. Expose map[uint16]string `json:"expose,omitempty"` - // Map of networks names ot ids the container should join to. + // Map of networks names or ids that the container should join. // You can request additional settings for each network, you can // set network aliases, static ips, static mac address and the // network interface name for this container on the specific network. diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index b6a18a274..8ca7ce4e6 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -893,7 +893,7 @@ func parseSecrets(secrets []string) ([]specgen.Secret, map[string]string, error) source = kv[1] case "type": if secretType != "" { - return nil, nil, errors.Wrap(secretParseError, "cannot set more tha one secret type") + return nil, nil, errors.Wrap(secretParseError, "cannot set more than one secret type") } if kv[1] != "mount" && kv[1] != "env" { return nil, nil, errors.Wrapf(secretParseError, "type %s is invalid", kv[1]) |