From e343c3ee4ee3bbb6fd3e4bd6dcadf540756548fe Mon Sep 17 00:00:00 2001
From: James Oliver <joliver@rancher.com>
Date: Tue, 24 May 2016 16:22:56 -0700
Subject: [PATCH] Marathon v1.1.1

---
 mesos-templates/marathon/0/docker-compose.yml  |  2 +-
 mesos-templates/marathon/0/rancher-compose.yml |  5 +----
 mesos-templates/marathon/1/docker-compose.yml  |  9 +++++++++
 mesos-templates/marathon/1/rancher-compose.yml | 18 ++++++++++++++++++
 mesos-templates/marathon/config.yml            |  4 ++--
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 mesos-templates/marathon/1/docker-compose.yml
 create mode 100644 mesos-templates/marathon/1/rancher-compose.yml

diff --git a/mesos-templates/marathon/0/docker-compose.yml b/mesos-templates/marathon/0/docker-compose.yml
index a9a05ed..ca77924 100644
--- a/mesos-templates/marathon/0/docker-compose.yml
+++ b/mesos-templates/marathon/0/docker-compose.yml
@@ -1,5 +1,5 @@
 marathon:
-  image: rancher/marathon:latest
+  image: rancher/marathon:v1.1.0
   environment:
     ZK_SERVICE: Mesos/zookeeper
     MESOS_SERVICE: Mesos/mesos-master
diff --git a/mesos-templates/marathon/0/rancher-compose.yml b/mesos-templates/marathon/0/rancher-compose.yml
index 587df27..08d7ee6 100644
--- a/mesos-templates/marathon/0/rancher-compose.yml
+++ b/mesos-templates/marathon/0/rancher-compose.yml
@@ -1,8 +1,5 @@
 .catalog:
-  name: Marathon
-  version: v1
-  description: |
-    Container orchestration platform for Mesos and DCOS
+  version: v1.1.0
   questions:
   - variable: MARATHON_HTTP_PORT
     description: Port to expose Marathon on.
diff --git a/mesos-templates/marathon/1/docker-compose.yml b/mesos-templates/marathon/1/docker-compose.yml
new file mode 100644
index 0000000..cde29dd
--- /dev/null
+++ b/mesos-templates/marathon/1/docker-compose.yml
@@ -0,0 +1,9 @@
+marathon:
+  image: rancher/marathon:v1.1.1
+  environment:
+    ZK_SERVICE: Mesos/zookeeper
+    MESOS_SERVICE: Mesos/mesos-master
+    MARATHON_HTTP_PORT: ${MARATHON_HTTP_PORT}
+  ports:
+  - "${MARATHON_HTTP_PORT}:${MARATHON_HTTP_PORT}"
+  privileged: true
\ No newline at end of file
diff --git a/mesos-templates/marathon/1/rancher-compose.yml b/mesos-templates/marathon/1/rancher-compose.yml
new file mode 100644
index 0000000..805bdf2
--- /dev/null
+++ b/mesos-templates/marathon/1/rancher-compose.yml
@@ -0,0 +1,18 @@
+.catalog:
+  version: v1.1.1
+  questions:
+  - variable: MARATHON_HTTP_PORT
+    description: Port to expose Marathon on.
+    label: Marathon Port
+    required: true
+    type: int
+    default: 8080
+marathon:
+  scale: 1
+  health_check:
+    port: ${MARATHON_HTTP_PORT}
+    interval: 3000
+    unhealthy_threshold: 2
+    healthy_threshold: 2
+    request_line: '/'
+    response_timeout: 2000
diff --git a/mesos-templates/marathon/config.yml b/mesos-templates/marathon/config.yml
index eec7c9f..5963a5f 100644
--- a/mesos-templates/marathon/config.yml
+++ b/mesos-templates/marathon/config.yml
@@ -1,7 +1,7 @@
 name: Marathon
 description: |
   A production-grade container orchestration platform
-version: v1
+version: v1.1.1
 category: Frameworks
 maintainer: James Oliver <joliver@rancher.com>
-minimum_rancher_version: v1.0.0
+minimum_rancher_version: v1.0.0
\ No newline at end of file