mirror of
https://github.com/containers/podman.git
synced 2026-02-05 06:45:31 +01:00
Merge pull request #26445 from aaron-ang/update-ulimit
Add ulimits to `podman update`
This commit is contained in:
@@ -440,14 +440,6 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
|
||||
)
|
||||
_ = cmd.RegisterFlagCompletionFunc(umaskFlagName, completion.AutocompleteNone)
|
||||
|
||||
ulimitFlagName := "ulimit"
|
||||
createFlags.StringSliceVar(
|
||||
&cf.Ulimit,
|
||||
ulimitFlagName, cf.Ulimit,
|
||||
"Ulimit options",
|
||||
)
|
||||
_ = cmd.RegisterFlagCompletionFunc(ulimitFlagName, completion.AutocompleteNone)
|
||||
|
||||
userFlagName := "user"
|
||||
createFlags.StringVarP(
|
||||
&cf.User,
|
||||
@@ -575,6 +567,14 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
|
||||
)
|
||||
_ = cmd.RegisterFlagCompletionFunc(unsetenvFlagName, completion.AutocompleteNone)
|
||||
|
||||
ulimitFlagName := "ulimit"
|
||||
createFlags.StringSliceVar(
|
||||
&cf.Ulimit,
|
||||
ulimitFlagName, cf.Ulimit,
|
||||
"Ulimit options",
|
||||
)
|
||||
_ = cmd.RegisterFlagCompletionFunc(ulimitFlagName, completion.AutocompleteNone)
|
||||
|
||||
healthCmdFlagName := "health-cmd"
|
||||
createFlags.StringVar(
|
||||
&cf.HealthCmd,
|
||||
|
||||
@@ -190,6 +190,18 @@ func update(cmd *cobra.Command, args []string) error {
|
||||
opts.UnsetEnv = env
|
||||
}
|
||||
|
||||
if cmd.Flags().Changed("ulimit") {
|
||||
ulimits, err := cmd.Flags().GetStringSlice("ulimit")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
rlimits, err := specgenutil.GenRlimits(ulimits)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
opts.Rlimits = rlimits
|
||||
}
|
||||
|
||||
rep, err := registry.ContainerEngine().ContainerUpdate(context.Background(), opts)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user