diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-04 13:19:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-04 13:19:35 -0400 |
commit | 4f31ade2b251514992dec7cfe9444dd0c62f00b5 (patch) | |
tree | b71846639dc1c0d2b3206c26afbf0fb9f8b507c5 /cmd/podman/common/create_opts.go | |
parent | aecb2023d240b69690f35721efcee7d724eba3f5 (diff) | |
parent | 164b64ea3baa8502a23fc0c7674f4a7e60507aa0 (diff) | |
download | podman-4f31ade2b251514992dec7cfe9444dd0c62f00b5.tar.gz podman-4f31ade2b251514992dec7cfe9444dd0c62f00b5.tar.bz2 podman-4f31ade2b251514992dec7cfe9444dd0c62f00b5.zip |
Merge pull request #13765 from giuseppe/do-not-set-oom-score-adj
specgen: do not set OOMScoreAdj by default
Diffstat (limited to 'cmd/podman/common/create_opts.go')
-rw-r--r-- | cmd/podman/common/create_opts.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index e5a2a0da3..ad6b3870a 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -286,7 +286,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c LogDriver: cc.HostConfig.LogConfig.Type, LogOptions: stringMaptoArray(cc.HostConfig.LogConfig.Config), Name: cc.Name, - OOMScoreAdj: cc.HostConfig.OomScoreAdj, + OOMScoreAdj: &cc.HostConfig.OomScoreAdj, Arch: "", OS: "", Variant: "", |