Implemented oom_score_adj

Signed-off-by: George Lester <glester491@gmail.com>
This commit is contained in:
George Lester 2016-07-05 23:43:25 -07:00
commit 6fe5d2b543
6 changed files with 30 additions and 1 deletions

View file

@ -70,6 +70,7 @@ DOCKER_CONFIG_KEYS = [
'mem_limit',
'memswap_limit',
'net',
'oom_score_adj'
'pid',
'ports',
'privileged',

View file

@ -166,6 +166,7 @@
}
]
},
"oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
"pid": {"type": ["string", "null"]},
"ports": {

View file

@ -53,6 +53,7 @@ DOCKER_START_KEYS = [
'log_opt',
'mem_limit',
'memswap_limit',
'oom_score_adj',
'pid',
'privileged',
'restart',
@ -695,6 +696,7 @@ class Service(object):
cpu_quota=options.get('cpu_quota'),
shm_size=options.get('shm_size'),
tmpfs=options.get('tmpfs'),
oom_score_adj=options.get('oom_score_adj')
)
def build(self, no_cache=False, pull=False, force_rm=False):