From 6995743200117865b187efde5938aff40aa7a750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Subtil?= <jeremy.subtil@biometis.ch>
Date: Fri, 5 Dec 2014 11:03:30 +0100
Subject: [PATCH 1/2] Ignore *.swp files

---
 .gitignore                            |   1 +
 mesos/dockerfile-templates/.mesos.swp | Bin 12288 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 mesos/dockerfile-templates/.mesos.swp

diff --git a/.gitignore b/.gitignore
index 6d7373f..f50ca1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+*.swp
diff --git a/mesos/dockerfile-templates/.mesos.swp b/mesos/dockerfile-templates/.mesos.swp
deleted file mode 100644
index ad010d5337d5e2820a88c8c1c15e801643997fbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI&!EVz)5C-6BFPwl1ByNZyJ#ex&ffS?)DnLr59Fj_*Eoa9b8n?E0wY!d#3p@-D
z0!N+!o&jC~)`<yFRXGFtR~oIoGupMko8_5yPlqFZ689;L9in@m#>d~wyW3wM5S<r!
zbyg--)#Nse^P-#@tK&kaNwJ~s?RrC%>P%EAPCGLbD=O3Jh1e+7l~3|YtXn19^*4DT
zk(bgGiI+CD;T)tO0D-FnuG6E3y>64)?cC?vw@$7q!Wsl1009U<00Izz00bcLp9*-h
zMeoA9ZMW}tt(~_n&Fw8F2tWV=5P$##AOHafKmY;|fB*#kL4hPAdVhoHONi$G|IhFL
zZ#RiPhWHTTb%;A5C`42Dxv9l~00bZa0SG_<0uX=z1Rwwb2>cxalanzg#z$x3Ia+XD
zIiC~-FT2j4oen0ihDT$%R8*TRw3x3~FJ!?<Hs>e`S5E9)EU&NPdRkY$j#FKR0xRj9
z2YZiud%c&3%MB!*Y3^h)<(c<pUnwg_yZBevdz@>v+C#Cowet%uL-%`!4_Jv$Rd{&i
zbZt{{agjS8XTP<~FIR|0FNWje5Q7Pi*6sBC)YZml>!1H|*a00*jz+vXa=+J)yM6ir
Dd?%c=


From b0c845d2960672dc746e276e00c3e1ab495589f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Subtil?= <jeremy.subtil@biometis.ch>
Date: Fri, 5 Dec 2014 11:40:40 +0100
Subject: [PATCH 2/2] Fix the mesos master/slave containers

---
 mesos/Makefile                   |  6 +++---
 mesos/README.md                  | 29 ++++++++++++++++++++++++++++-
 mesos/dockerfile-templates/mesos | 14 +++++++++-----
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/mesos/Makefile b/mesos/Makefile
index 2936255..f0abe5e 100644
--- a/mesos/Makefile
+++ b/mesos/Makefile
@@ -2,10 +2,10 @@ all: help
 
 help:
 	@echo 'Options available:'
-	@echo '  make images VERSION=0.20.1-1.0.ubuntu1404'
-	@echo '  make push   VERSION=0.20.1-1.0.ubuntu1404'
+	@echo '  make images VERSION=0.21.0-1.0.debian77'
+	@echo '  make push   VERSION=0.21.0-1.0.debian77'
 	@echo ''
-	@echo 'VERSION should be set to the full Ubuntu 14.04 Mesos package version'
+	@echo 'VERSION should be set to the full Debian 7 Mesos package version'
 
 check-version:
 ifndef VERSION
diff --git a/mesos/README.md b/mesos/README.md
index 3fa88f0..522e13f 100644
--- a/mesos/README.md
+++ b/mesos/README.md
@@ -1 +1,28 @@
-Note: Mesos should be run with Docker host networking (`--net=host`).
+Mesos containers
+================
+
+Build
+-----
+
+```
+make images VERSION=<Debian 7 Mesos pkg version>
+```
+
+Run mesos-master
+----------------
+
+```
+# docker run -d \
+    --net=host \
+    mesosphere/mesos-master:<Debian 7 Mesos pkg version>
+```
+
+Run mesos-slave
+---------------
+
+```
+# docker run -d \
+    -e MESOS_MASTER=<master/zk URL> \
+    --net=host \
+    mesosphere/mesos-slave:<Debian 7 Mesos pkg version>
+```
diff --git a/mesos/dockerfile-templates/mesos b/mesos/dockerfile-templates/mesos
index db5b3c5..91117a7 100644
--- a/mesos/dockerfile-templates/mesos
+++ b/mesos/dockerfile-templates/mesos
@@ -1,7 +1,11 @@
-FROM ubuntu:14.04
+FROM java:7-jre
 MAINTAINER Mesosphere <support@mesosphere.io>
 
-RUN echo "deb http://repos.mesosphere.io/ubuntu/ trusty main" > /etc/apt/sources.list.d/mesosphere.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF
-RUN apt-get -y update
-RUN apt-get -y install mesos=VERSION
+ENV MESOS_LOG_DIR /var/log
+
+RUN \
+  echo "deb http://repos.mesosphere.io/debian/ wheezy main" > /etc/apt/sources.list.d/mesosphere.list && \
+  apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF && \
+  apt-get -y update && \
+  apt-get -y --no-install-recommends install mesos=VERSION && \
+  apt-get clean