From b502032b424fe2b3e520744a5480db78915507a6 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Mon, 9 Nov 2015 12:59:14 +0100
Subject: [PATCH 1/3] Add MESOS_DOCKER_DUMP_LOGS to enforce log dumping

---
 cluster/mesos/docker/util.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh
index 8ddd6c40bb3..ec39a290e15 100644
--- a/cluster/mesos/docker/util.sh
+++ b/cluster/mesos/docker/util.sh
@@ -317,6 +317,9 @@ function validate-cluster {
 
 # Delete a kubernetes cluster
 function kube-down {
+  if [ "${MESOS_DOCKER_DUMP_LOGS:-false}" == "true" ]; then
+    cluster::mesos::docker::dump_logs "${MESOS_DOCKER_WORK_DIR}/log"
+  fi
   echo "Stopping ${KUBERNETES_PROVIDER} cluster" 1>&2
   # Since restoring a stopped cluster is not yet supported, use the nuclear option
   cluster::mesos::docker::docker_compose kill

From 3d2ae0e67f5bff3bbc138749a125f176a9f3fadd Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Thu, 12 Nov 2015 00:28:01 +0100
Subject: [PATCH 2/3] Move MESOS_DOCKER_DUMP_LOGS default to config-default.sh

---
 cluster/mesos/docker/config-default.sh | 4 ++++
 cluster/mesos/docker/util.sh           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cluster/mesos/docker/config-default.sh b/cluster/mesos/docker/config-default.sh
index ebee2f1cbed..7d732e4ba81 100755
--- a/cluster/mesos/docker/config-default.sh
+++ b/cluster/mesos/docker/config-default.sh
@@ -62,3 +62,7 @@ MESOS_DOCKER_WORK_DIR="${MESOS_DOCKER_WORK_DIR:-${HOME}/tmp/kubernetes}"
 
 # Arguments to pass to docker-engine running on the mesos-slave-dind containers.
 DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS:---log-level=error}"
+
+# Force a dump of the logs into ${MESOS_DOCKER_WORK_DIR}/log on kube-down.sh. By
+# default this only happens when kube-up.sh fails.
+MESOS_DOCKER_DUMP_LOGS="${MESOS_DOCKER_DUMP_LOGS:-false}"
diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh
index ec39a290e15..d6d5de68f92 100644
--- a/cluster/mesos/docker/util.sh
+++ b/cluster/mesos/docker/util.sh
@@ -317,7 +317,7 @@ function validate-cluster {
 
 # Delete a kubernetes cluster
 function kube-down {
-  if [ "${MESOS_DOCKER_DUMP_LOGS:-false}" == "true" ]; then
+  if [ "${MESOS_DOCKER_DUMP_LOGS}" == "true" ]; then
     cluster::mesos::docker::dump_logs "${MESOS_DOCKER_WORK_DIR}/log"
   fi
   echo "Stopping ${KUBERNETES_PROVIDER} cluster" 1>&2

From 58f57f8a183705d2ba1215473ab0a45de2ba1d24 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Thu, 12 Nov 2015 00:28:21 +0100
Subject: [PATCH 3/3] Move MESOS_DOCKER_SKIP_BUILD default to config-default.sh

---
 cluster/mesos/docker/config-default.sh | 3 +++
 cluster/mesos/docker/util.sh           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/mesos/docker/config-default.sh b/cluster/mesos/docker/config-default.sh
index 7d732e4ba81..ab2482d0917 100755
--- a/cluster/mesos/docker/config-default.sh
+++ b/cluster/mesos/docker/config-default.sh
@@ -66,3 +66,6 @@ DOCKER_DAEMON_ARGS="${DOCKER_DAEMON_ARGS:---log-level=error}"
 # Force a dump of the logs into ${MESOS_DOCKER_WORK_DIR}/log on kube-down.sh. By
 # default this only happens when kube-up.sh fails.
 MESOS_DOCKER_DUMP_LOGS="${MESOS_DOCKER_DUMP_LOGS:-false}"
+
+# Skip rebuilding the involved docker containers on kube-up.sh.
+MESOS_DOCKER_SKIP_BUILD="${MESOS_DOCKER_SKIP_BUILD:-false}"
diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh
index d6d5de68f92..838936f9ec3 100644
--- a/cluster/mesos/docker/util.sh
+++ b/cluster/mesos/docker/util.sh
@@ -267,7 +267,7 @@ function kube-up {
   echo "Pulling Docker images" 1>&2
   cluster::mesos::docker::docker_compose_lazy_pull
 
-  if [ "${MESOS_DOCKER_SKIP_BUILD:-false}" != "true" ]; then
+  if [ "${MESOS_DOCKER_SKIP_BUILD}" != "true" ]; then
     echo "Building Docker images" 1>&2
     # TODO: version images (k8s version, git sha, and dirty state) to avoid re-building them every time.
     "${provider_root}/km/build.sh"