aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-13 16:44:52 +0100
committerGitHub <noreply@github.com>2022-01-13 16:44:52 +0100
commitab7228b3c27719e447de4dffe9b3fd7f67d6f346 (patch)
tree281392e18e84d47b859554b0bd612ea5db431e98 /cmd/podman
parente98058a3cf4f5ba4cd2d37dfdb2a0951b9aa9730 (diff)
parentf257d983943d6ec2253d50a245cd4810cab45e4b (diff)
downloadpodman-ab7228b3c27719e447de4dffe9b3fd7f67d6f346.tar.gz
podman-ab7228b3c27719e447de4dffe9b3fd7f67d6f346.tar.bz2
podman-ab7228b3c27719e447de4dffe9b3fd7f67d6f346.zip
Merge pull request #12836 from cdoern/podSysCtl
Podman Pod Create --sysctl support
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/common/create.go19
1 files changed, 10 insertions, 9 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index b60169990..e95e447e1 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -563,15 +563,6 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
)
_ = cmd.RegisterFlagCompletionFunc(stopTimeoutFlagName, completion.AutocompleteNone)
- sysctlFlagName := "sysctl"
- createFlags.StringSliceVar(
- &cf.Sysctl,
- sysctlFlagName, []string{},
- "Sysctl options",
- )
- //TODO: Add function for sysctl completion.
- _ = cmd.RegisterFlagCompletionFunc(sysctlFlagName, completion.AutocompleteNone)
-
systemdFlagName := "systemd"
createFlags.StringVar(
&cf.Systemd,
@@ -712,6 +703,16 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
`If a container with the same name exists, replace it`,
)
}
+
+ sysctlFlagName := "sysctl"
+ createFlags.StringSliceVar(
+ &cf.Sysctl,
+ sysctlFlagName, []string{},
+ "Sysctl options",
+ )
+ //TODO: Add function for sysctl completion.
+ _ = cmd.RegisterFlagCompletionFunc(sysctlFlagName, completion.AutocompleteNone)
+
securityOptFlagName := "security-opt"
createFlags.StringArrayVar(
&cf.SecurityOpt,