Merge pull request #648 from containous/update-marathon

Update marathon

examples/compose-marathon.yml

@@ -1,43 +1,59 @@
-zk:
-  image: bobrik/zookeeper
-  net: host
-  environment:
-    ZK_CONFIG: tickTime=2000,initLimit=10,syncLimit=5,maxClientCnxns=128,forceSync=no,clientPort=2181
-    ZK_ID: 1
 
-master:
+version: '2'
-  image: mesosphere/mesos-master:0.28.1-2.0.20.ubuntu1404
+services:
-  net: host
+  zookeeper:
+    image: netflixoss/exhibitor:1.5.2
+    hostname: zookeeper
+    ports:
+      - "2181:2181"
+  mesos-master:
+    image: mesosphere/marathon:v1.2.0-RC6
+    hostname: mesos-master
+    entrypoint: [ "mesos-master" ]
+    ports:
+      - "5050:5050"
+    links:
+      - zookeeper
     environment:
-    MESOS_ZK: zk://127.0.0.1:2181/mesos
+      - MESOS_CLUSTER=local
-    MESOS_HOSTNAME: 127.0.0.1
+      - MESOS_HOSTNAME=mesos-master.docker
-    MESOS_IP: 127.0.0.1
+      - MESOS_LOG_DIR=/var/log
-    MESOS_QUORUM: 1
+      - MESOS_WORK_DIR=/var/lib/mesos
-    MESOS_CLUSTER: docker-compose
+      - MESOS_QUORUM=1
-    MESOS_WORK_DIR: /var/lib/mesos
+      - MESOS_ZK=zk://zookeeper:2181/mesos
-
+  mesos-slave:
-slave:
+    image: mesosphere/mesos-slave-dind:0.2.4_mesos-0.27.2_docker-1.8.2_ubuntu-14.04.4
-  image: mesosphere/mesos-slave:0.28.1-2.0.20.ubuntu1404
+    entrypoint:
-  net: host
+      - mesos-slave
-  pid: host
     privileged: true
+    hostname: mesos-slave
+    ports:
+      - "5051:5051"
+    links:
+      - zookeeper
+      - mesos-master
     environment:
-    MESOS_MASTER: zk://127.0.0.1:2181/mesos
+      - MESOS_CONTAINERIZERS=docker,mesos
-    MESOS_HOSTNAME: 127.0.0.1
+      - MESOS_ISOLATOR=cgroups/cpu,cgroups/mem
-    MESOS_IP: 127.0.0.1
+      - MESOS_LOG_DIR=/var/log
-    MESOS_CONTAINERIZERS: docker,mesos
+      - MESOS_MASTER=zk://zookeeper:2181/mesos
+      - MESOS_PORT=5051
+      - MESOS_WORK_DIR=/var/lib/mesos
+      - MESOS_EXECUTOR_REGISTRATION_TIMEOUT=5mins
+      - MESOS_EXECUTOR_SHUTDOWN_GRACE_PERIOD=90secs
+      - MESOS_DOCKER_STOP_TIMEOUT=60secs
+      - MESOS_RESOURCES=cpus:2;mem:2048;disk:20480;ports(*):[12000-12999]
     volumes:
-    - /sys/fs/cgroup:/sys/fs/cgroup
+      - "/var/run/docker.sock:/var/run/docker.sock"
-    - /usr/bin/docker:/usr/bin/docker:ro
+  marathon:
-    - /usr/lib/x86_64-linux-gnu/libapparmor.so.1:/usr/lib/x86_64-linux-gnu/libapparmor.so.1:ro
+    image: mesosphere/marathon:v1.2.0-RC6
-    - /var/run/docker.sock:/var/run/docker.sock
+    ports:
-    - /lib/x86_64-linux-gnu/libsystemd-journal.so.0:/lib/x86_64-linux-gnu/libsystemd-journal.so.0
+     - "8080:8080"
-
+    links:
-marathon:
+      - zookeeper
-  image: mesosphere/marathon:v1.1.1
+      - mesos-master
-  net: host
+    extra_hosts:
+      - "mesos-slave:172.17.0.1"
     environment:
-    MARATHON_MASTER: zk://127.0.0.1:2181/mesos
+      - MARATHON_ZK=zk://zookeeper:2181/marathon
-    MARATHON_ZK: zk://127.0.0.1:2181/marathon
+      - MARATHON_MASTER=zk://zookeeper:2181/mesos
-    MARATHON_HOSTNAME: 127.0.0.1
-  command: --event_subscriber http_callback