diff options
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/auto-update.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/create.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/ps.go | 2 | ||||
| -rw-r--r-- | cmd/podman/images/build.go | 3 | ||||
| -rw-r--r-- | cmd/podman/root.go | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index 8e17b49e0..677266c83 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -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) diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 5e48aa622..f9d33a223 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -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(): diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 2aa3b3a9b..a78b35c08 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -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)) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 923109b15..ff5c6ec09 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -386,6 +386,9 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil } containerConfig := registry.PodmanConfig() + for _, arg := range containerConfig.RuntimeFlags { + runtimeFlags = append(runtimeFlags, "--"+arg) + } if containerConfig.Engine.CgroupManager == config.SystemdCgroupsManager { runtimeFlags = append(runtimeFlags, "--systemd-cgroup") } diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 6cf369f0a..60725b111 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -273,6 +273,7 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) { pFlags.StringVar(&opts.RegistriesConf, "registries-conf", "", "Path to a registries.conf to use for image processing") pFlags.StringVar(&opts.Runroot, "runroot", "", "Path to the 'run directory' where all state information is stored") pFlags.StringVar(&opts.RuntimePath, "runtime", "", "Path to the OCI-compatible binary used to run containers, default is /usr/bin/runc") + pFlags.StringArrayVar(&opts.RuntimeFlags, "runtime-flag", []string{}, "add global flags for the container runtime") // -s is deprecated due to conflict with -s on subcommands pFlags.StringVar(&opts.StorageDriver, "storage-driver", "", "Select which storage driver is used to manage storage of images and containers (default is overlay)") pFlags.StringArrayVar(&opts.StorageOpts, "storage-opt", []string{}, "Used to pass an option to the storage driver") |