From 053cb26dde51f97a631e13fb87cbd6a7ec79f80f Mon Sep 17 00:00:00 2001
From: Karl Isenberg <karl@mesosphere.io>
Date: Tue, 18 Aug 2015 16:50:13 -0700
Subject: [PATCH] [mesos/docker] Expose DOCKER_DAEMON_ARGS

---
 cluster/mesos/docker/config-default.sh  | 4 +++-
 cluster/mesos/docker/docker-compose.yml | 6 ++----
 cluster/mesos/docker/util.sh            | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cluster/mesos/docker/config-default.sh b/cluster/mesos/docker/config-default.sh
index 9798210ae08..e56446d1324 100755
--- a/cluster/mesos/docker/config-default.sh
+++ b/cluster/mesos/docker/config-default.sh
@@ -64,4 +64,6 @@ MESOS_DOCKER_WORK_DIR="${MESOS_DOCKER_WORK_DIR:-${HOME}/tmp/kubernetes}"
 # Usage: ${MESOS_DOCKER_IMAGE_DIR}/<component>/docker
 # Must not be either an AUFS mount or an SMB/CIFS mount.
 # If using docker-machine or boot2docker, should NOT be under /Users (which is mounted from the host into the docker vm).
-MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR:-/var/tmp/kubernetes}"
\ No newline at end of file
+MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR:-/var/tmp/kubernetes}"
+
+DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS:---log-level=error}"
diff --git a/cluster/mesos/docker/docker-compose.yml b/cluster/mesos/docker/docker-compose.yml
index fca56d19113..42ed9521b92 100644
--- a/cluster/mesos/docker/docker-compose.yml
+++ b/cluster/mesos/docker/docker-compose.yml
@@ -42,14 +42,13 @@ mesosslave1:
   - MESOS_CONTAINERIZERS=docker,mesos
   - MESOS_WORK_DIR=/var/tmp/mesos
   - DOCKER_NETWORK_OFFSET=0.0.1.0
-  - DOCKER_DAEMON_ARGS=--log-level=error
+  - DOCKER_DAEMON_ARGS
   links:
   - etcd
   - mesosmaster1
   - "ambassador:apiserver"
   volumes:
   - ${MESOS_DOCKER_WORK_DIR}/mesosslave1/mesos:/var/tmp/mesos
-  - ${MESOS_DOCKER_IMAGE_DIR}/mesosslave1/docker:/var/lib/docker
 mesosslave2:
   hostname: mesosslave2
   privileged: true
@@ -66,14 +65,13 @@ mesosslave2:
   - MESOS_CONTAINERIZERS=docker,mesos
   - MESOS_WORK_DIR=/var/tmp/mesos
   - DOCKER_NETWORK_OFFSET=0.0.2.0
-  - DOCKER_DAEMON_ARGS=--log-level=error
+  - DOCKER_DAEMON_ARGS
   links:
   - etcd
   - mesosmaster1
   - "ambassador:apiserver"
   volumes:
   - ${MESOS_DOCKER_WORK_DIR}/mesosslave2/mesos:/var/tmp/mesos
-  - ${MESOS_DOCKER_IMAGE_DIR}/mesosslave2/docker:/var/lib/docker
 apiserver:
   hostname: apiserver
   image: mesosphere/kubernetes-mesos
diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh
index 2cc2053c448..ff51e8eee69 100644
--- a/cluster/mesos/docker/util.sh
+++ b/cluster/mesos/docker/util.sh
@@ -257,6 +257,7 @@ function kube-up {
   export KUBE_KEYGEN_TIMEOUT="${KUBE_KEYGEN_TIMEOUT}"
   export MESOS_DOCKER_WORK_DIR="${MESOS_DOCKER_WORK_DIR}"
   export MESOS_DOCKER_IMAGE_DIR="${MESOS_DOCKER_IMAGE_DIR}"
+  export DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS}"
   docker-compose -f "${compose_file}" up -d
 
   # await-health-check requires GNU timeout