mirror of
https://github.com/containers/podman.git
synced 2025-06-27 21:50:18 +08:00
Merge pull request #13659 from rhatdan/codespell
Run codespell to cleanup typos
This commit is contained in:
@ -197,7 +197,7 @@ func installExecutable(user string) (string, error) {
|
|||||||
// suffix. The goal is to help users harden against privilege escalation from loose
|
// suffix. The goal is to help users harden against privilege escalation from loose
|
||||||
// filesystem permissions.
|
// 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
|
// paths to standard unix users, the daemon executable is copied into a separate more
|
||||||
// restricted area of the filesystem.
|
// restricted area of the filesystem.
|
||||||
if err := verifyRootDeep(installPrefix); err != nil {
|
if err := verifyRootDeep(installPrefix); err != nil {
|
||||||
|
@ -102,7 +102,7 @@ func init() {
|
|||||||
_ = initCmd.RegisterFlagCompletionFunc(IgnitionPathFlagName, completion.AutocompleteDefault)
|
_ = initCmd.RegisterFlagCompletionFunc(IgnitionPathFlagName, completion.AutocompleteDefault)
|
||||||
|
|
||||||
rootfulFlagName := "rootful"
|
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?
|
// TODO should we allow for a users to append to the qemu cmdline?
|
||||||
|
@ -12,7 +12,7 @@ Using this image is helpful to:
|
|||||||
|
|
||||||
* Prove that basic Podman operations are working on the host.
|
* Prove that basic Podman operations are working on the host.
|
||||||
* Shows that the image was pulled from the quay.io container registry.
|
* 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.
|
* The created container was able to stream output to your terminal.
|
||||||
|
|
||||||
## Directory Contents
|
## Directory Contents
|
||||||
|
@ -298,7 +298,7 @@ sub podman_man {
|
|||||||
$previous_flag = '';
|
$previous_flag = '';
|
||||||
}
|
}
|
||||||
elsif ($line =~ /^###\s+\w+\s+OPTIONS/) {
|
elsif ($line =~ /^###\s+\w+\s+OPTIONS/) {
|
||||||
# poaman image trust has sections for set & show
|
# podman image trust has sections for set & show
|
||||||
$section = 'flags';
|
$section = 'flags';
|
||||||
$previous_flag = '';
|
$previous_flag = '';
|
||||||
}
|
}
|
||||||
|
@ -338,7 +338,7 @@ func (r *Runtime) setupSlirp4netns(ctr *Container, netns ns.NetNS) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// wait until slirp4nets is ready before reseting this value
|
// wait until slirp4nets is ready before resetting this value
|
||||||
slirpReadyWg.Wait()
|
slirpReadyWg.Wait()
|
||||||
return ioutil.WriteFile(ipv6ConfDefaultAcceptDadSysctl, orgValue, 0644)
|
return ioutil.WriteFile(ipv6ConfDefaultAcceptDadSysctl, orgValue, 0644)
|
||||||
})
|
})
|
||||||
|
@ -2024,7 +2024,7 @@ type TopologySpreadConstraint struct {
|
|||||||
// but giving higher precedence to topologies that would help reduce the
|
// but giving higher precedence to topologies that would help reduce the
|
||||||
// skew.
|
// skew.
|
||||||
// A constraint is considered "Unsatisfiable" for an incoming pod
|
// 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.
|
// "MaxSkew" on some topology.
|
||||||
// For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
|
// For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
|
||||||
// labelSelector spread as 3/1/1:
|
// labelSelector spread as 3/1/1:
|
||||||
|
@ -337,7 +337,7 @@ func FinishThrottleDevices(s *specgen.SpecGenerator) error {
|
|||||||
return nil
|
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) {
|
func ConfigToSpec(rt *libpod.Runtime, specg *specgen.SpecGenerator, containerID string) (*libpod.Container, error) {
|
||||||
c, err := rt.LookupContainer(containerID)
|
c, err := rt.LookupContainer(containerID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -143,7 +143,7 @@ skip "N/A under podman" \
|
|||||||
# TODO
|
# TODO
|
||||||
# Some of the podman tests in CI expects exit code 125, which might not be true
|
# 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
|
# 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
|
# 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`.
|
# 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
|
# However apart from this test case no other test case was able to trigger this behavior
|
||||||
|
@ -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")
|
SkipIfRootless("ip netns is not supported for rootless users")
|
||||||
|
|
||||||
networkNSName := RandomString(12)
|
networkNSName := RandomString(12)
|
||||||
|
@ -89,7 +89,7 @@ host.slirp4netns.executable | $expr_path
|
|||||||
}
|
}
|
||||||
|
|
||||||
@test "podman info netavark " {
|
@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 [[ "$NETWORK_BACKEND" == "netavark" ]]; then
|
||||||
if ! is_netavark; then
|
if ! is_netavark; then
|
||||||
# Assume is_netavark() will provide debugging feedback.
|
# Assume is_netavark() will provide debugging feedback.
|
||||||
|
@ -614,7 +614,7 @@ EOF
|
|||||||
"
|
"
|
||||||
|
|
||||||
CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE cat /etc/resolv.conf
|
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"
|
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
|
# create network with dns
|
||||||
@ -623,12 +623,12 @@ EOF
|
|||||||
run_podman network create --subnet "$subnet.0/24" $netname
|
run_podman network create --subnet "$subnet.0/24" $netname
|
||||||
# custom server overwrites the network dns server
|
# custom server overwrites the network dns server
|
||||||
CONTAINERS_CONF=$containersconf run_podman run --network $netname --rm $IMAGE cat /etc/resolv.conf
|
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"
|
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
|
# we should use the integrated dns server
|
||||||
run_podman run --network $netname --rm $IMAGE cat /etc/resolv.conf
|
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"
|
is "$output" ".*nameserver $subnet.1.*" "integrated dns nameserver is set"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user