diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-27 07:21:47 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-27 13:07:19 +0000 |
| commit | 02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c (patch) | |
| tree | cbb0d236dc3fe4c83874389ec521b1424b571b24 /vendor/github.com/opencontainers/runc/libcontainer/configs | |
| parent | 876a30590b93757ca16ee607dee4f4458983620c (diff) | |
| download | podman-02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c.tar.gz podman-02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c.tar.bz2 podman-02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c.zip | |
Update vendored version of runc,buildah,containers/image
There is a compiler warning that has been fixed in the
upstream, so I figured we should update to fix.
Also vendor in latest buildah to get better support for running builds in rootless
mode.
Vendor in latest containers/image to allow daemon support to be pluggable.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1169
Approved by: mheon
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/configs')
| -rw-r--r-- | vendor/github.com/opencontainers/runc/libcontainer/configs/config.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go index 3cae4fd8d..b1c4762fe 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go @@ -141,9 +141,10 @@ type Config struct { // OomScoreAdj specifies the adjustment to be made by the kernel when calculating oom scores // for a process. Valid values are between the range [-1000, '1000'], where processes with - // higher scores are preferred for being killed. + // higher scores are preferred for being killed. If it is unset then we don't touch the current + // value. // More information about kernel oom score calculation here: https://lwn.net/Articles/317814/ - OomScoreAdj int `json:"oom_score_adj"` + OomScoreAdj *int `json:"oom_score_adj,omitempty"` // UidMappings is an array of User ID mappings for User Namespaces UidMappings []IDMap `json:"uid_mappings"` |