summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-13 17:59:58 +0100
committerGitHub <noreply@github.com>2020-01-13 17:59:58 +0100
commite83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc (patch)
tree190410369b4bcbd12891fcfc1ecbe5bb21ea4050 /pkg
parent9e2e4d7615311b38b1e553af32a5666888ef3c96 (diff)
parent4093b2c0111369f9590d803c53a40b79ae2fd1dd (diff)
downloadpodman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.tar.gz
podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.tar.bz2
podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.zip
Merge pull request #4817 from rhatdan/codespell
Add codespell to validate spelling mistakes in code.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/adapter/containers.go2
-rw-r--r--pkg/adapter/runtime.go2
-rw-r--r--pkg/hooks/docs/oci-hooks.5.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index fdd9f6ab3..4228c3dca 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -375,7 +375,7 @@ func (r *LocalRuntime) selectDetachKeys(flagValue string) (string, error) {
config, err := r.GetConfig()
if err != nil {
- return "", errors.Wrapf(err, "unable to retrive runtime config")
+ return "", errors.Wrapf(err, "unable to retrieve runtime config")
}
if config.DetachKeys != "" {
return config.DetachKeys, nil
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go
index 5f880e807..121f85755 100644
--- a/pkg/adapter/runtime.go
+++ b/pkg/adapter/runtime.go
@@ -59,7 +59,7 @@ type Volume struct {
// VolumeFilter is for filtering volumes on the client
type VolumeFilter func(*Volume) bool
-// GetRuntimeNoStore returns a localruntime struct wit an embedded runtime but
+// GetRuntimeNoStore returns a localruntime struct with an embedded runtime but
// without a configured storage.
func GetRuntimeNoStore(ctx context.Context, c *cliconfig.PodmanCommand) (*LocalRuntime, error) {
runtime, err := libpodruntime.GetRuntimeNoStore(ctx, c)
diff --git a/pkg/hooks/docs/oci-hooks.5.md b/pkg/hooks/docs/oci-hooks.5.md
index b50a6bddc..7d13ffa82 100644
--- a/pkg/hooks/docs/oci-hooks.5.md
+++ b/pkg/hooks/docs/oci-hooks.5.md
@@ -25,7 +25,7 @@ Tools consuming this format may also opt to monitor the hook directories for cha
Hooks are injected in the order obtained by sorting the JSON file names, after converting them to lower case, based on their Unicode code points.
For example, a matching hook defined in `01-my-hook.json` would be injected before matching hooks defined in `02-another-hook.json` and `01-UPPERCASE.json`.
-It is strongly recommended to make the sort oder unambiguous depending on an ASCII-only prefix (like the `01`/`02` above).
+It is strongly recommended to make the sort order unambiguous depending on an ASCII-only prefix (like the `01`/`02` above).
Each JSON file should contain an object with one of the following schemas.