From be5da54b464c9af9e5a193bb56fa1d703795fb02 Mon Sep 17 00:00:00 2001 From: Dan Merino Date: Thu, 27 Nov 2014 16:28:56 -0600 Subject: [PATCH] Use DOCKER_LOCKEDMEMORY to set ulimit -l before starting Docker. Very important when applications inside the containers need to lock to large amounts of memory. --- bootstrapvz/plugins/docker_daemon/assets/default/docker | 3 +++ bootstrapvz/plugins/docker_daemon/assets/init.d/docker | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/bootstrapvz/plugins/docker_daemon/assets/default/docker b/bootstrapvz/plugins/docker_daemon/assets/default/docker index c1dc5c4..b2fc34d 100644 --- a/bootstrapvz/plugins/docker_daemon/assets/default/docker +++ b/bootstrapvz/plugins/docker_daemon/assets/default/docker @@ -9,6 +9,9 @@ # Use DOCKER_NOFILE to set ulimit -n before starting Docker. #DOCKER_NOFILE=65536 +# Use DOCKER_LOCKEDMEMORY to set ulimit -l before starting Docker. +#DOCKER_LOCKEDMEMORY=unlimited + # If you need Docker to use an HTTP proxy, it can also be specified here. #export http_proxy="http://127.0.0.1:3128/" diff --git a/bootstrapvz/plugins/docker_daemon/assets/init.d/docker b/bootstrapvz/plugins/docker_daemon/assets/init.d/docker index 825b4dd..829cab5 100644 --- a/bootstrapvz/plugins/docker_daemon/assets/init.d/docker +++ b/bootstrapvz/plugins/docker_daemon/assets/init.d/docker @@ -87,6 +87,10 @@ case "$1" in ulimit -n $DOCKER_NOFILE fi + if [ -n "$DOCKER_LOCKEDMEMORY" ]; then + ulimit -l $DOCKER_LOCKEDMEMORY + fi + log_begin_msg "Starting $DOCKER_DESC: $BASE" start-stop-daemon --start --background \ --no-close \