diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-15 12:17:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 12:17:12 +0200 |
| commit | 3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7 (patch) | |
| tree | fc635fda5032a7054f562025b4152ac54ba20f85 /cmd/podman/root.go | |
| parent | d5db2af340b94b9900cf194e35d57af40a695fe1 (diff) | |
| parent | 146c68f3acdc01f393a6cfadf9bc98eec3e8de94 (diff) | |
| download | podman-3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7.tar.gz podman-3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7.tar.bz2 podman-3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7.zip | |
Merge pull request #7452 from jwhonce/issues/7136
Refactor API build endpoint to be more compliant
Diffstat (limited to 'cmd/podman/root.go')
| -rw-r--r-- | cmd/podman/root.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 60725b111..d079018a0 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -273,7 +273,6 @@ 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") @@ -301,6 +300,7 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) { // Only create these flags for ABI connections if !registry.IsRemote() { + pFlags.StringArrayVar(&opts.RuntimeFlags, "runtime-flag", []string{}, "add global flags for the container runtime") pFlags.BoolVar(&useSyslog, "syslog", false, "Output logging information to syslog as well as the console (default false)") } } |