summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-23 17:38:43 +0100
committerGitHub <noreply@github.com>2020-12-23 17:38:43 +0100
commit54b82a175f16f27849e6791f65bf73eccae4701a (patch)
tree063ba11dfe87b045518793cd2a6f1bcfa3926671 /cmd
parent8544bb57fe5e9222509827a7f5aa648516b9cd98 (diff)
parent4fa1fce930f13d71f39b65bad3f46f61d961ab51 (diff)
downloadpodman-54b82a175f16f27849e6791f65bf73eccae4701a.tar.gz
podman-54b82a175f16f27849e6791f65bf73eccae4701a.tar.bz2
podman-54b82a175f16f27849e6791f65bf73eccae4701a.zip
Merge pull request #8787 from jsoref/spelling
Spelling
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common/create.go10
-rw-r--r--cmd/podman/common/create_opts.go12
-rw-r--r--cmd/podman/common/specgen.go4
-rw-r--r--cmd/podman/completion/completion.go2
-rw-r--r--cmd/podman/containers/cp.go2
-rw-r--r--cmd/podman/containers/create.go4
-rw-r--r--cmd/podman/containers/mount.go8
-rw-r--r--cmd/podman/images/pull.go2
-rw-r--r--cmd/podman/inspect/inspect.go2
9 files changed, 23 insertions, 23 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index 14086ace4..bbd4f6bae 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -642,7 +642,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
storageOptFlagName := "storage-opt"
createFlags.StringSliceVar(
- &cf.StoreageOpt,
+ &cf.StorageOpt,
storageOptFlagName, []string{},
"Storage driver options per container",
)
@@ -671,7 +671,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
sysctlFlagName, []string{},
"Sysctl options",
)
- //TODO: Add function for systctl completion.
+ //TODO: Add function for sysctl completion.
_ = cmd.RegisterFlagCompletionFunc(sysctlFlagName, completion.AutocompleteNone)
systemdFlagName := "systemd"
@@ -696,13 +696,13 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
"Allocate a pseudo-TTY for container",
)
- timezonezFlagName := "tz"
+ timezoneFlagName := "tz"
createFlags.StringVar(
&cf.Timezone,
- timezonezFlagName, containerConfig.TZ(),
+ timezoneFlagName, containerConfig.TZ(),
"Set timezone in container",
)
- _ = cmd.RegisterFlagCompletionFunc(timezonezFlagName, completion.AutocompleteNone) //TODO: add timezone completion
+ _ = cmd.RegisterFlagCompletionFunc(timezoneFlagName, completion.AutocompleteNone) //TODO: add timezone completion
umaskFlagName := "umask"
createFlags.StringVar(
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index e975def0a..9635f4135 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -98,7 +98,7 @@ type ContainerCLIOpts struct {
SignaturePolicy string
StopSignal string
StopTimeout uint
- StoreageOpt []string
+ StorageOpt []string
SubUIDName string
SubGIDName string
Sysctl []string
@@ -310,7 +310,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
// on speculation by Matt and I. We think that these come into play later
// like with start. We believe this is just a difference in podman/compat
cliOpts := ContainerCLIOpts{
- // Attach: nil, // dont need?
+ // Attach: nil, // don't need?
Authfile: "",
CapAdd: append(capAdd, cc.HostConfig.CapAdd...),
CapDrop: append(cappDrop, cc.HostConfig.CapDrop...),
@@ -321,11 +321,11 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
CPURTPeriod: uint64(cc.HostConfig.CPURealtimePeriod),
CPURTRuntime: cc.HostConfig.CPURealtimeRuntime,
CPUShares: uint64(cc.HostConfig.CPUShares),
- // CPUS: 0, // dont need?
+ // CPUS: 0, // don't need?
CPUSetCPUs: cc.HostConfig.CpusetCpus,
CPUSetMems: cc.HostConfig.CpusetMems,
- // Detach: false, // dont need
- // DetachKeys: "", // dont need
+ // Detach: false, // don't need
+ // DetachKeys: "", // don't need
Devices: devices,
DeviceCGroupRule: nil,
DeviceReadBPs: readBps,
@@ -359,7 +359,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
Rm: cc.HostConfig.AutoRemove,
SecurityOpt: cc.HostConfig.SecurityOpt,
StopSignal: cc.Config.StopSignal,
- StoreageOpt: stringMaptoArray(cc.HostConfig.StorageOpt),
+ StorageOpt: stringMaptoArray(cc.HostConfig.StorageOpt),
Sysctl: stringMaptoArray(cc.HostConfig.Sysctls),
Systemd: "true", // podman default
TmpFS: stringMaptoArray(cc.HostConfig.Tmpfs),
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index c416d0d7b..287836d9f 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -488,9 +488,9 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
s.ConmonPidFile = c.ConmonPIDFile
// TODO
- // ouitside of specgen and oci though
+ // outside of specgen and oci though
// defaults to true, check spec/storage
- // s.readon = c.ReadOnlyTmpFS
+ // s.readonly = c.ReadOnlyTmpFS
// TODO convert to map?
// check if key=value and convert
sysmap := make(map[string]string)
diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go
index 84942a508..b615b33d0 100644
--- a/cmd/podman/completion/completion.go
+++ b/cmd/podman/completion/completion.go
@@ -32,7 +32,7 @@ var (
Example: `podman completion bash
podman completion zsh -f _podman
podman completion fish --no-desc`,
- //dont show this command to users
+ //don't show this command to users
Hidden: true,
}
)
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
index e0161824f..69b61a06c 100644
--- a/cmd/podman/containers/cp.go
+++ b/cmd/podman/containers/cp.go
@@ -55,7 +55,7 @@ var (
func cpFlags(cmd *cobra.Command) {
flags := cmd.Flags()
flags.BoolVar(&cpOpts.Extract, "extract", false, "Deprecated...")
- flags.BoolVar(&cpOpts.Pause, "pause", true, "Deorecated")
+ flags.BoolVar(&cpOpts.Pause, "pause", true, "Deprecated")
_ = flags.MarkHidden("extract")
_ = flags.MarkHidden("pause")
}
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index 3d87c71a9..420813ba9 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -171,7 +171,7 @@ func createInit(c *cobra.Command) error {
}
cliVals.UserNS = c.Flag("userns").Value.String()
// if user did not modify --userns flag and did turn on
- // uid/gid mappsings, set userns flag to "private"
+ // uid/gid mappings, set userns flag to "private"
if !c.Flag("userns").Changed && cliVals.UserNS == "host" {
if len(cliVals.UIDMap) > 0 ||
len(cliVals.GIDMap) > 0 ||
@@ -239,7 +239,7 @@ func pullImage(imageName string) (string, error) {
if cliVals.Platform != "" {
if cliVals.OverrideArch != "" || cliVals.OverrideOS != "" {
- return "", errors.Errorf("--platform option can not be specified with --overide-arch or --override-os")
+ return "", errors.Errorf("--platform option can not be specified with --override-arch or --override-os")
}
split := strings.SplitN(cliVals.Platform, "/", 2)
cliVals.OverrideOS = split[0]
diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go
index fb2101d64..c92b19a19 100644
--- a/cmd/podman/containers/mount.go
+++ b/cmd/podman/containers/mount.go
@@ -39,7 +39,7 @@ var (
ValidArgsFunction: common.AutocompleteContainers,
}
- containerMountCommmand = &cobra.Command{
+ containerMountCommand = &cobra.Command{
Use: mountCommand.Use,
Short: mountCommand.Short,
Long: mountCommand.Long,
@@ -76,11 +76,11 @@ func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{
Mode: []entities.EngineMode{entities.ABIMode},
- Command: containerMountCommmand,
+ Command: containerMountCommand,
Parent: containerCmd,
})
- mountFlags(containerMountCommmand)
- validate.AddLatestFlag(containerMountCommmand, &mountOpts.Latest)
+ mountFlags(containerMountCommand)
+ validate.AddLatestFlag(containerMountCommand, &mountOpts.Latest)
}
func mount(_ *cobra.Command, args []string) error {
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go
index f8e1ee226..2d881a906 100644
--- a/cmd/podman/images/pull.go
+++ b/cmd/podman/images/pull.go
@@ -139,7 +139,7 @@ func imagePull(cmd *cobra.Command, args []string) error {
}
if platform != "" {
if pullOptions.OverrideArch != "" || pullOptions.OverrideOS != "" {
- return errors.Errorf("--platform option can not be specified with --overide-arch or --override-os")
+ return errors.Errorf("--platform option can not be specified with --override-arch or --override-os")
}
split := strings.SplitN(platform, "/", 2)
pullOptions.OverrideOS = split[0]
diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go
index cc48b7ae4..76613ae71 100644
--- a/cmd/podman/inspect/inspect.go
+++ b/cmd/podman/inspect/inspect.go
@@ -51,7 +51,7 @@ func AddInspectFlagSet(cmd *cobra.Command) *entities.InspectOptions {
_ = cmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone)
typeFlagName := "type"
- flags.StringVarP(&opts.Type, typeFlagName, "t", AllType, fmt.Sprintf("Specify inspect-oject type (%q, %q or %q)", ImageType, ContainerType, AllType))
+ flags.StringVarP(&opts.Type, typeFlagName, "t", AllType, fmt.Sprintf("Specify inspect-object type (%q, %q or %q)", ImageType, ContainerType, AllType))
_ = cmd.RegisterFlagCompletionFunc(typeFlagName, common.AutocompleteInspectType)
validate.AddLatestFlag(cmd, &opts.Latest)