summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/podman-mac-helper/install.go2
-rw-r--r--cmd/podman/machine/init.go2
-rw-r--r--contrib/helloimage/README.md2
-rw-r--r--go.mod2
-rw-r--r--go.sum3
-rwxr-xr-xhack/xref-helpmsgs-manpages2
-rw-r--r--libpod/networking_slirp4netns.go2
-rw-r--r--pkg/k8s.io/api/core/v1/types.go2
-rw-r--r--pkg/specgen/generate/container.go2
-rwxr-xr-xtest/buildah-bud/apply-podman-deltas2
-rw-r--r--test/e2e/run_networking_test.go2
-rw-r--r--test/system/005-info.bats2
-rw-r--r--test/system/500-networking.bats6
-rw-r--r--vendor/modules.txt2
14 files changed, 17 insertions, 16 deletions
diff --git a/cmd/podman-mac-helper/install.go b/cmd/podman-mac-helper/install.go
index 7f623ecb6..a1b99e66c 100644
--- a/cmd/podman-mac-helper/install.go
+++ b/cmd/podman-mac-helper/install.go
@@ -197,7 +197,7 @@ func installExecutable(user string) (string, error) {
// suffix. The goal is to help users harden against privilege escalation from loose
// filesystem permissions.
//
- // Since userpsace package management tools, such as brew, delegate management of system
+ // Since userspace package management tools, such as brew, delegate management of system
// paths to standard unix users, the daemon executable is copied into a separate more
// restricted area of the filesystem.
if err := verifyRootDeep(installPrefix); err != nil {
diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go
index e07b6fbfa..8fb17cf54 100644
--- a/cmd/podman/machine/init.go
+++ b/cmd/podman/machine/init.go
@@ -102,7 +102,7 @@ func init() {
_ = initCmd.RegisterFlagCompletionFunc(IgnitionPathFlagName, completion.AutocompleteDefault)
rootfulFlagName := "rootful"
- flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container exectution")
+ flags.BoolVar(&initOpts.Rootful, rootfulFlagName, false, "Whether this machine should prefer rootful container execution")
}
// TODO should we allow for a users to append to the qemu cmdline?
diff --git a/contrib/helloimage/README.md b/contrib/helloimage/README.md
index ca69f87b4..528466f7b 100644
--- a/contrib/helloimage/README.md
+++ b/contrib/helloimage/README.md
@@ -12,7 +12,7 @@ Using this image is helpful to:
* Prove that basic Podman operations are working on the host.
* Shows that the image was pulled from the quay.io container registry.
- * Container creation was successfuly accomplished. (`podman ps -a`)
+ * Container creation was successfully accomplished. (`podman ps -a`)
* The created container was able to stream output to your terminal.
## Directory Contents
diff --git a/go.mod b/go.mod
index 93651629d..6cebbb795 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/digitalocean/go-qemu v0.0.0-20210326154740-ac9e0b687001
github.com/docker/distribution v2.8.1+incompatible
- github.com/docker/docker v20.10.13+incompatible
+ github.com/docker/docker v20.10.14+incompatible
github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11
github.com/docker/go-plugins-helpers v0.0.0-20211224144127-6eecb7beb651
github.com/docker/go-units v0.4.0
diff --git a/go.sum b/go.sum
index 9e63fee58..b218b0fc2 100644
--- a/go.sum
+++ b/go.sum
@@ -448,8 +448,9 @@ github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v20.10.3-0.20220208084023-a5c757555091+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v20.10.13+incompatible h1:5s7uxnKZG+b8hYWlPYUi6x1Sjpq2MSt96d15eLZeHyw=
github.com/docker/docker v20.10.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.14+incompatible h1:+T9/PRYWNDo5SZl5qS1r9Mo/0Q8AwxKKPtu9S1yxM0w=
+github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o=
github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
diff --git a/hack/xref-helpmsgs-manpages b/hack/xref-helpmsgs-manpages
index 33ba43e9b..1f022531e 100755
--- a/hack/xref-helpmsgs-manpages
+++ b/hack/xref-helpmsgs-manpages
@@ -298,7 +298,7 @@ sub podman_man {
$previous_flag = '';
}
elsif ($line =~ /^###\s+\w+\s+OPTIONS/) {
- # poaman image trust has sections for set & show
+ # podman image trust has sections for set & show
$section = 'flags';
$previous_flag = '';
}
diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go
index 3af0df3d1..b0247dc5c 100644
--- a/libpod/networking_slirp4netns.go
+++ b/libpod/networking_slirp4netns.go
@@ -338,7 +338,7 @@ func (r *Runtime) setupSlirp4netns(ctr *Container, netns ns.NetNS) error {
return err
}
- // wait until slirp4nets is ready before reseting this value
+ // wait until slirp4nets is ready before resetting this value
slirpReadyWg.Wait()
return ioutil.WriteFile(ipv6ConfDefaultAcceptDadSysctl, orgValue, 0644)
})
diff --git a/pkg/k8s.io/api/core/v1/types.go b/pkg/k8s.io/api/core/v1/types.go
index 833814bc6..a488e5f28 100644
--- a/pkg/k8s.io/api/core/v1/types.go
+++ b/pkg/k8s.io/api/core/v1/types.go
@@ -2024,7 +2024,7 @@ type TopologySpreadConstraint struct {
// but giving higher precedence to topologies that would help reduce the
// skew.
// A constraint is considered "Unsatisfiable" for an incoming pod
- // if and only if every possible node assigment for that pod would violate
+ // if and only if every possible node assignment for that pod would violate
// "MaxSkew" on some topology.
// For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
// labelSelector spread as 3/1/1:
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index 0e9d33dd8..118d80e2c 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -337,7 +337,7 @@ func FinishThrottleDevices(s *specgen.SpecGenerator) error {
return nil
}
-// ConfigToSpec takes a completed container config and converts it back into a specgenerator for purposes of cloning an exisiting container
+// ConfigToSpec takes a completed container config and converts it back into a specgenerator for purposes of cloning an existing container
func ConfigToSpec(rt *libpod.Runtime, specg *specgen.SpecGenerator, containerID string) (*libpod.Container, error) {
c, err := rt.LookupContainer(containerID)
if err != nil {
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 26d7fc075..cb8357e89 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -143,7 +143,7 @@ skip "N/A under podman" \
# TODO
# Some of the podman tests in CI expects exit code 125, which might not be true
# since exit code from runtime is relayed as it is without any modification both
-# in `buildah` and `podman`. Following behviour is seen when PR https://github.com/containers/buildah/pull/3809
+# in `buildah` and `podman`. Following behaviour is seen when PR https://github.com/containers/buildah/pull/3809
# added a test here https://github.com/containers/buildah/blob/main/tests/bud.bats#L3183
# which relays exit code from runtime as it is, in case of both `podman` and `buildah`.
# However apart from this test case no other test case was able to trigger this behavior
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 2202cadd8..faf4db753 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -766,7 +766,7 @@ EXPOSE 2004-2005/tcp`, ALPINE)
}
- It("podman run newtork inspect fails gracefully on non-reachable network ns", func() {
+ It("podman run network inspect fails gracefully on non-reachable network ns", func() {
SkipIfRootless("ip netns is not supported for rootless users")
networkNSName := RandomString(12)
diff --git a/test/system/005-info.bats b/test/system/005-info.bats
index 0f7e8b2e4..1d84ede9b 100644
--- a/test/system/005-info.bats
+++ b/test/system/005-info.bats
@@ -89,7 +89,7 @@ host.slirp4netns.executable | $expr_path
}
@test "podman info netavark " {
- # Confirm netavark in use when explicitely required by execution environment.
+ # Confirm netavark in use when explicitly required by execution environment.
if [[ "$NETWORK_BACKEND" == "netavark" ]]; then
if ! is_netavark; then
# Assume is_netavark() will provide debugging feedback.
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 4b1a22981..a95561635 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -614,7 +614,7 @@ EOF
"
CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE cat /etc/resolv.conf
- is "$output" "search example.com$nl.*" "correct seach domain"
+ is "$output" "search example.com$nl.*" "correct search domain"
is "$output" ".*nameserver 1.1.1.1${nl}nameserver $searchIP${nl}nameserver 1.0.0.1${nl}nameserver 8.8.8.8" "nameserver order is correct"
# create network with dns
@@ -623,12 +623,12 @@ EOF
run_podman network create --subnet "$subnet.0/24" $netname
# custom server overwrites the network dns server
CONTAINERS_CONF=$containersconf run_podman run --network $netname --rm $IMAGE cat /etc/resolv.conf
- is "$output" "search example.com$nl.*" "correct seach domain"
+ is "$output" "search example.com$nl.*" "correct search domain"
is "$output" ".*nameserver 1.1.1.1${nl}nameserver $searchIP${nl}nameserver 1.0.0.1${nl}nameserver 8.8.8.8" "nameserver order is correct"
# we should use the integrated dns server
run_podman run --network $netname --rm $IMAGE cat /etc/resolv.conf
- is "$output" "search dns.podman.*" "correct seach domain"
+ is "$output" "search dns.podman.*" "correct search domain"
is "$output" ".*nameserver $subnet.1.*" "integrated dns nameserver is set"
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 8da7d16eb..132b1a80c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -326,7 +326,7 @@ github.com/docker/distribution/registry/client/auth/challenge
github.com/docker/distribution/registry/client/transport
github.com/docker/distribution/registry/storage/cache
github.com/docker/distribution/registry/storage/cache/memory
-# github.com/docker/docker v20.10.13+incompatible
+# github.com/docker/docker v20.10.14+incompatible
## explicit
github.com/docker/docker/api
github.com/docker/docker/api/types
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-27 08:48:10 +0000