mirror of
https://github.com/containers/podman.git
synced 2025-07-02 16:57:24 +08:00
Fix up errors found by codespell
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
2
API.md
2
API.md
@ -1900,7 +1900,7 @@ insecure [[]string](#[]string)
|
||||
blocked [[]string](#[]string)
|
||||
### <a name="InfoStore"></a>type InfoStore
|
||||
|
||||
InfoStore describes the host's storage informatoin
|
||||
InfoStore describes the host's storage information
|
||||
|
||||
containers [int](https://godoc.org/builtin#int)
|
||||
|
||||
|
@ -41,7 +41,7 @@ func init() {
|
||||
|
||||
func autoUpdate(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 0 {
|
||||
// Backwards compat. System tests expext this error string.
|
||||
// Backwards compat. System tests expect this error string.
|
||||
return errors.Errorf("`%s` takes no arguments", cmd.CommandPath())
|
||||
}
|
||||
report, failures := registry.ContainerEngine().AutoUpdate(registry.GetContext(), autoUpdateOptions)
|
||||
|
@ -235,7 +235,7 @@ func pullImage(imageName string) (string, error) {
|
||||
imageRef, err := alltransports.ParseImageName(imageName)
|
||||
switch {
|
||||
case err != nil:
|
||||
// Assume we specified a local image withouth the explicit storage transport.
|
||||
// Assume we specified a local image without the explicit storage transport.
|
||||
fallthrough
|
||||
|
||||
case imageRef.Transport().Name() == storage.Transport.Name():
|
||||
|
@ -414,7 +414,7 @@ func portsToString(ports []ocicni.PortMapping) string {
|
||||
continue
|
||||
}
|
||||
}
|
||||
// For each portMapKey, format group list and appned to output string.
|
||||
// For each portMapKey, format group list and append to output string.
|
||||
for _, portKey := range groupKeyList {
|
||||
group := portGroupMap[portKey]
|
||||
portDisplay = append(portDisplay, formatGroup(portKey, group.first, group.last))
|
||||
|
@ -116,7 +116,7 @@ gsutil cors get gs://libpod-master-releases
|
||||
To function properly (allow client "trust" of content from `storage.googleapis.com`) the followiing
|
||||
metadata JSON should be used. Following the JSON, is an example of the command used to set this
|
||||
metadata on the libpod-master-releases bucket. For additional information about configuring CORS
|
||||
please referr to [the google-storage documentation](https://cloud.google.com/storage/docs/configuring-cors).
|
||||
please refer to [the google-storage documentation](https://cloud.google.com/storage/docs/configuring-cors).
|
||||
|
||||
```JSON
|
||||
[
|
||||
|
@ -235,7 +235,7 @@ setup_rootless() {
|
||||
useradd -g $ROOTLESS_GID -u $ROOTLESS_UID --no-user-group --create-home $ROOTLESS_USER
|
||||
chown -R $ROOTLESS_USER:$ROOTLESS_USER "$GOPATH" "$GOSRC"
|
||||
|
||||
echo "creating ssh keypair for $USER"
|
||||
echo "creating ssh key pair for $USER"
|
||||
[[ -r "$HOME/.ssh/id_rsa" ]] || \
|
||||
ssh-keygen -P "" -f "$HOME/.ssh/id_rsa"
|
||||
|
||||
|
@ -51,7 +51,7 @@ Set the systemd unit name prefix for pods. The default is *pod*.
|
||||
|
||||
**--separator**=*separator*
|
||||
|
||||
Set the systemd unit name seperator between the name/id of a container/pod and the prefix. The default is *-*.
|
||||
Set the systemd unit name separator between the name/id of a container/pod and the prefix. The default is *-*.
|
||||
|
||||
## Examples
|
||||
|
||||
|
@ -27,7 +27,7 @@ LIBPODROOT=$(realpath "$(dirname $0)/../")
|
||||
# else: Assume $PWD is the root of the libpod repository
|
||||
[[ "$LIBPODROOT" != "/" ]] || LIBPODROOT=$PWD
|
||||
|
||||
# Command shortcuts save some typing (asumes $LIBPODROOT is subdir of $HOME)
|
||||
# Command shortcuts save some typing (assumes $LIBPODROOT is subdir of $HOME)
|
||||
PGCLOUD="$GCLOUD_SUDO podman run -it --rm -e AS_ID=$UID -e AS_USER=$USER --security-opt label=disable -v $TMPDIR:$HOME -v $HOME/.config/gcloud:$HOME/.config/gcloud -v $HOME/.config/gcloud/ssh:$HOME/.ssh -v $LIBPODROOT:$LIBPODROOT $GCLOUD_IMAGE --configuration=libpod --project=$PROJECT"
|
||||
SCP_CMD="$PGCLOUD compute scp"
|
||||
|
||||
|
@ -629,7 +629,7 @@ func (c *Container) ExecRemove(sessionID string, force bool) error {
|
||||
|
||||
logrus.Infof("Removing container %s exec session %s", c.ID(), session.ID())
|
||||
|
||||
// Update status of exec session if running, so we cna check if it
|
||||
// Update status of exec session if running, so we can check if it
|
||||
// stopped in the meantime.
|
||||
if session.State == define.ExecStateRunning {
|
||||
running, err := c.ociRuntime.ExecUpdateStatus(c, session.ID())
|
||||
|
@ -1269,7 +1269,7 @@ func (c *Container) stop(timeout uint) error {
|
||||
c.state.StoppedByUser = true
|
||||
|
||||
if !conmonAlive {
|
||||
// Conmon is dead, so we can't epect an exit code.
|
||||
// Conmon is dead, so we can't expect an exit code.
|
||||
c.state.ExitCode = -1
|
||||
c.state.FinishedTime = time.Now()
|
||||
c.state.State = define.ContainerStateStopped
|
||||
|
@ -163,6 +163,6 @@ var (
|
||||
ErrNetworkOnPodContainer = errors.New("network cannot be configured when it is shared with a pod")
|
||||
|
||||
// ErrStoreNotInitialized indicates that the container storage was never
|
||||
// initilized.
|
||||
ErrStoreNotInitialized = errors.New("the container storage was never initilized")
|
||||
// initialized.
|
||||
ErrStoreNotInitialized = errors.New("the container storage was never initialized")
|
||||
)
|
||||
|
@ -87,7 +87,7 @@ type InspectPodInfraConfig struct {
|
||||
// HostAdd adds a number of hosts to the infra container's resolv.conf
|
||||
// which will be shared with the rest of the pod.
|
||||
HostAdd []string
|
||||
// Networks is a list of CNI networks te pod will join.
|
||||
// Networks is a list of CNI networks the pod will join.
|
||||
Networks []string
|
||||
}
|
||||
|
||||
|
@ -162,7 +162,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
|
||||
return nil, errors.Wrapf(err, "error parsing system uptime")
|
||||
}
|
||||
|
||||
// TODO Isnt there a simple lib for this, something like humantime?
|
||||
// TODO Isn't there a simple lib for this, something like humantime?
|
||||
hoursFound := false
|
||||
var timeBuffer bytes.Buffer
|
||||
var hoursBuffer bytes.Buffer
|
||||
|
@ -608,7 +608,7 @@ func WithSecLabels(labelOpts []string) CtrCreateOption {
|
||||
}
|
||||
}
|
||||
|
||||
// WithUser sets the user identity field in configutation.
|
||||
// WithUser sets the user identity field in configuration.
|
||||
// Valid uses [user | user:group | uid | uid:gid | user:gid | uid:group ].
|
||||
func WithUser(user string) CtrCreateOption {
|
||||
return func(ctr *Container) error {
|
||||
|
@ -17,7 +17,7 @@ import (
|
||||
)
|
||||
|
||||
// filtersFromRequests extracts the "filters" parameter from the specified
|
||||
// http.Request. The paramater can either be a `map[string][]string` as done
|
||||
// http.Request. The parameter can either be a `map[string][]string` as done
|
||||
// in new versions of Docker and libpod, or a `map[string]map[string]bool` as
|
||||
// done in older versions of Docker. We have to do a bit of Yoga to support
|
||||
// both - just as Docker does as well.
|
||||
|
@ -24,7 +24,7 @@ func (s *APIServer) registerPlayHandlers(r *mux.Router) error {
|
||||
// name: tlsVerify
|
||||
// type: boolean
|
||||
// default: true
|
||||
// description: Require HTTPS and verify signatures when contating registries.
|
||||
// description: Require HTTPS and verify signatures when contacting registries.
|
||||
// - in: body
|
||||
// name: request
|
||||
// description: Kubernetes YAML file.
|
||||
|
@ -126,7 +126,7 @@ func encodeMultiAuthConfigs(authConfigs map[string]types.DockerAuthConfig) (stri
|
||||
// one or more container registries. If tmpDir is empty, the system's default
|
||||
// TMPDIR will be used.
|
||||
func authConfigsToAuthFile(authConfigs map[string]types.DockerAuthConfig) (string, error) {
|
||||
// Intitialize an empty temporary JSON file.
|
||||
// Initialize an empty temporary JSON file.
|
||||
tmpFile, err := ioutil.TempFile("", "auth.json.")
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
@ -119,7 +119,7 @@ var _ = Describe("Podman system", func() {
|
||||
// Alpine image should not be pruned as used by running container
|
||||
Expect(systemPruneResponse.ImagePruneReport.Report.Id).
|
||||
ToNot(ContainElement("docker.io/library/alpine:latest"))
|
||||
// Though unsed volume is available it should not be pruned as flag set to false.
|
||||
// Though unused volume is available it should not be pruned as flag set to false.
|
||||
Expect(len(systemPruneResponse.VolumePruneReport)).To(Equal(0))
|
||||
})
|
||||
|
||||
|
@ -32,7 +32,7 @@ type PlayKubePod struct {
|
||||
ID string
|
||||
// Containers - the IDs of the containers running in the created pod.
|
||||
Containers []string
|
||||
// Logs - non-fatal erros and log messages while processing.
|
||||
// Logs - non-fatal errors and log messages while processing.
|
||||
Logs []string
|
||||
}
|
||||
|
||||
|
@ -130,7 +130,7 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
|
||||
func (ir *ImageEngine) ManifestAnnotate(ctx context.Context, names []string, opts entities.ManifestAnnotateOptions) (string, error) {
|
||||
listImage, err := ir.Libpod.ImageRuntime().NewFromLocal(names[0])
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "error retreiving local image from image name %s", names[0])
|
||||
return "", errors.Wrapf(err, "error retrieving local image from image name %s", names[0])
|
||||
}
|
||||
digest, err := digest.Parse(names[1])
|
||||
if err != nil {
|
||||
|
@ -28,7 +28,7 @@ func TestNewIPAMDefaultRoute(t *testing.T) {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := NewIPAMDefaultRoute(tt.isIPv6)
|
||||
if err != nil {
|
||||
t.Errorf("no errorr expected: %v", err)
|
||||
t.Errorf("no error expected: %v", err)
|
||||
}
|
||||
if !reflect.DeepEqual(got, tt.want) {
|
||||
t.Errorf("NewIPAMDefaultRoute() = %v, want %v", got, tt.want)
|
||||
|
@ -206,7 +206,7 @@ func InspectNetwork(config *config.Config, name string) (map[string]interface{},
|
||||
}
|
||||
|
||||
// Exists says whether a given network exists or not; it meant
|
||||
// specifically for restful reponses so 404s can be used
|
||||
// specifically for restful responses so 404s can be used
|
||||
func Exists(config *config.Config, name string) (bool, error) {
|
||||
_, err := ReadRawCNIConfByName(config, name)
|
||||
if err != nil {
|
||||
|
@ -334,7 +334,7 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
|
||||
} else {
|
||||
defaultEnv, err = env.ParseSlice(runtimeConfig.Containers.Env)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "Env fields in containers.conf failed ot parse")
|
||||
return nil, errors.Wrap(err, "Env fields in containers.conf failed to parse")
|
||||
}
|
||||
defaultEnv = env.Join(env.DefaultEnvVariables(), defaultEnv)
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ func finalizeMounts(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Ru
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
// Supercede from --volumes-from.
|
||||
// Supersede from --volumes-from.
|
||||
for dest, mount := range volFromMounts {
|
||||
baseMounts[dest] = mount
|
||||
}
|
||||
|
@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestGetImageConfigStopSignal(t *testing.T) {
|
||||
// Linux-only beause parsing signal names is not supported on non-Linux systems by
|
||||
// Linux-only because parsing signal names is not supported on non-Linux systems by
|
||||
// pkg/signal.
|
||||
stopSignalValidInt, err := GetImageConfig([]string{"STOPSIGNAL 9"})
|
||||
require.Nil(t, err)
|
||||
|
@ -257,7 +257,7 @@ type InfoRegistry (
|
||||
blocked: []string
|
||||
)
|
||||
|
||||
# InfoStore describes the host's storage informatoin
|
||||
# InfoStore describes the host's storage information
|
||||
type InfoStore (
|
||||
containers: int,
|
||||
images: int,
|
||||
|
@ -750,7 +750,7 @@ func portsToString(ports []ocicni.PortMapping) string {
|
||||
continue
|
||||
}
|
||||
}
|
||||
// For each portMapKey, format group list and appned to output string.
|
||||
// For each portMapKey, format group list and append to output string.
|
||||
for _, portKey := range groupKeyList {
|
||||
group := portGroupMap[portKey]
|
||||
portDisplay = append(portDisplay, formatGroup(portKey, group.first, group.last))
|
||||
@ -794,7 +794,7 @@ func GetRunlabel(label string, runlabelImage string, ctx context.Context, runtim
|
||||
return runLabel, imageName, err
|
||||
}
|
||||
|
||||
// GenerateRunlabelCommand generates the command that will eventually be execucted by Podman.
|
||||
// GenerateRunlabelCommand generates the command that will eventually be executed by Podman.
|
||||
func GenerateRunlabelCommand(runLabel, imageName, name string, opts map[string]string, extraArgs []string, globalOpts string) ([]string, []string, error) {
|
||||
// If no name is provided, we use the image's basename instead.
|
||||
if name == "" {
|
||||
|
@ -93,7 +93,7 @@ var _ = Describe("Podman run", func() {
|
||||
Expect(session.OutputToString()).ToNot(Equal(cap.OutputToString()))
|
||||
})
|
||||
|
||||
It("podman Regular capabilties", func() {
|
||||
It("podman Regular capabilities", func() {
|
||||
SkipIfRootless()
|
||||
os.Setenv("CONTAINERS_CONF", "config/containers.conf")
|
||||
setup := podmanTest.RunTopContainer("test1")
|
||||
@ -105,7 +105,7 @@ var _ = Describe("Podman run", func() {
|
||||
Expect(result.OutputToString()).To(ContainSubstring("NET_RAW"))
|
||||
})
|
||||
|
||||
It("podman drop capabilties", func() {
|
||||
It("podman drop capabilities", func() {
|
||||
os.Setenv("CONTAINERS_CONF", "config/containers-caps.conf")
|
||||
setup := podmanTest.RunTopContainer("test1")
|
||||
setup.WaitWithDefaultTimeout()
|
||||
|
@ -261,7 +261,7 @@ var _ = Describe("Podman prune", func() {
|
||||
// Two as pods infra container and one newly created.
|
||||
Expect(podmanTest.NumberOfContainers()).To(Equal(3))
|
||||
|
||||
// image list current count should not be pruned if all flag isnt enabled
|
||||
// image list current count should not be pruned if all flag isn't enabled
|
||||
session = podmanTest.Podman([]string{"images"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
numberOfImages := len(session.OutputToStringArray())
|
||||
|
@ -484,7 +484,7 @@ var _ = Describe("Podman ps", func() {
|
||||
Expect(ps.OutputToString()).To(ContainSubstring("0.0.0.0:8080->80/tcp"))
|
||||
})
|
||||
|
||||
It("podman ps truncate long create commad", func() {
|
||||
It("podman ps truncate long create command", func() {
|
||||
session := podmanTest.Podman([]string{"run", ALPINE, "echo", "very", "long", "create", "command"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session.ExitCode()).To(Equal(0))
|
||||
|
@ -59,7 +59,7 @@ class TestImages(unittest.TestCase):
|
||||
self.assertFalse
|
||||
|
||||
# Validates if name updates when the image is retagged.
|
||||
@unittest.skip("dosent work now")
|
||||
@unittest.skip("doesn't work now")
|
||||
def test_retag_valid_image(self):
|
||||
client.tag(constant.ALPINE_SHORTNAME, "demo", "rename")
|
||||
alpine_image = client.inspect_image(constant.ALPINE)
|
||||
|
@ -128,7 +128,7 @@ echo "\$1"
|
||||
printenv | grep MYENV | sort | sed -e 's/^MYENV.=//'
|
||||
EOF
|
||||
|
||||
# For overridding with --env-file
|
||||
# For overriding with --env-file
|
||||
cat >$PODMAN_TMPDIR/env-file <<EOF
|
||||
MYENV3=$s_env3
|
||||
http_proxy=http-proxy-in-env-file
|
||||
|
@ -75,10 +75,10 @@ var _ = Describe("Common functions test", func() {
|
||||
Expect(newer).To(Equal(expect), "Version compare results is not as expect.")
|
||||
Expect(err == nil).To(Equal(isNil), "Error is not as expect.")
|
||||
},
|
||||
Entry("Invlid kernel version: 0", "0", false, false),
|
||||
Entry("Invalid kernel version: 0", "0", false, false),
|
||||
Entry("Older kernel version:0.0", "0.0", true, true),
|
||||
Entry("Newer kernel version: 100.17.14", "100.17.14", false, true),
|
||||
Entry("Invlid kernel version: I am not a kernel version", "I am not a kernel version", false, false),
|
||||
Entry("Invalid kernel version: I am not a kernel version", "I am not a kernel version", false, false),
|
||||
)
|
||||
|
||||
DescribeTable("Test TestIsCommandAvailable",
|
||||
|
@ -42,7 +42,7 @@ $ podman run -v ~/mycontent:/content:Z fedora touch /content/file
|
||||
|
||||
Make sure the content is private for the container. Do not relabel system directories and content.
|
||||
Relabeling system content might cause other confined services on your machine to fail. For these
|
||||
types of containers we recommmend that disable SELinux separation. The option `--security-opt label=disable`
|
||||
types of containers we recommend that disable SELinux separation. The option `--security-opt label=disable`
|
||||
will disable SELinux separation for the container.
|
||||
|
||||
$ podman run --security-opt label=disable -v ~:/home/user fedora touch /home/user/file
|
||||
@ -533,7 +533,7 @@ With the default detach key combo ctrl-p,ctrl-q, shell history navigation
|
||||
display this previous command. Or anything else. Conmon is waiting for an
|
||||
additional character to see if the user wants to detach from the container.
|
||||
Adding additional characters to the command will cause it to be displayed along
|
||||
with the additonal character. If the user types ctrl-p a second time the shell
|
||||
with the additional character. If the user types ctrl-p a second time the shell
|
||||
display the 2nd to last command.
|
||||
|
||||
#### Solution
|
||||
|
Reference in New Issue
Block a user