From fea5da95899cb3f5ba2635684c9ba9cb2c9a0856 Mon Sep 17 00:00:00 2001
From: Frank Scholten <frank@frankscholten.nl>
Date: Tue, 13 Oct 2015 13:05:35 +0200
Subject: [PATCH 1/2] Changed Zookeeper image to latest

We cannot pull versions 3.4.5 or 3.4.6. See https://hub.docker.com/r/jplock/zookeeper/
---
 src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java b/src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java
index 653d9712..ba5c73ed 100644
--- a/src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java
+++ b/src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java
@@ -8,7 +8,7 @@
 public class ZooKeeper extends AbstractContainer {
 
     private static final String MESOS_LOCAL_IMAGE = "jplock/zookeeper";
-    public static final String REGISTRY_TAG = "3.4.5";
+    public static final String REGISTRY_TAG = "latest";
 
     private final String clusterId;
 

From 48f206d5b6641f8dfe1a2d9dba41f58adb1ce2b5 Mon Sep 17 00:00:00 2001
From: Frank Scholten <frank@frankscholten.nl>
Date: Tue, 13 Oct 2015 13:09:20 +0200
Subject: [PATCH 2/2] Removed old script for docker-in-docker.

---
 run.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 run.sh

diff --git a/run.sh b/run.sh
deleted file mode 100644
index 2d615b68..00000000
--- a/run.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# Workaround for https://github.com/jpetazzo/dind/issues/86
-rm -rf /var/lib/docker/btrfs
-
-IFACE='eth0'
-IP=$(ip -4 address show $IFACE | grep 'inet' | sed 's/.*inet \([0-9\.]\+\).*/\1/')
-
-echo "" >> /etc/hosts
-
-for i in $(seq 1 $NUMBER_OF_SLAVES)
-do
-  mkdir -p /var/lib/mesos/$i
-  echo "$IP slave$i" >> /etc/hosts
-
-  echo "" >> /etc/supervisor.conf
-
-  echo "[program:mesos-slave$i]"  >> /etc/supervisor.conf
-  echo "user=root"  >> /etc/supervisor.conf
-  echo "command=mesos-slave --port=505$i --master=zk://localhost:2181/mesos --work_dir=/var/lib/mesos/$i --no-switch_user --hostname=slave$i --resources=%(ENV_SLAVE${i}_RESOURCES)s"  >> /etc/supervisor.conf
-  echo "redirect_stderr=true"  >> /etc/supervisor.conf
-  echo "process_name=mesos_slave_$i"  >> /etc/supervisor.conf
-  echo "" >> /etc/supervisor.conf
-
-done
-
-sed -i s/@@NUM_SLAVES@@/${NUMBER_OF_SLAVES}/g /etc/supervisor.conf
-supervisord -c /etc/supervisor.conf -e error