[marathon] Fix and extend integration tests.

- Update compose file.
- Add integration test for Marathon application deployment.

integration/resources/compose/marathon.yml

@@ -1,43 +1,54 @@
-zk:
-  image: bobrik/zookeeper
-  net: host
-  environment:
-    ZK_CONFIG: tickTime=2000,initLimit=10,syncLimit=5,maxClientCnxns=128,forceSync=no,clientPort=2181
-    ZK_ID: " 1"
+zookeeper:
+  image: zookeeper:3.4.10
 
-master:
-  image: mesosphere/mesos-master:0.28.1-2.0.20.ubuntu1404
-  net: host
+mesos-master:
+  links:
+    - zookeeper
+  image: mesosphere/mesos-master:1.0.1-2.0.93.ubuntu1404
+  # Uncomment published ports for interactive debugging.
+  # ports:
+  #   - "5050:5050"
   environment:
-    MESOS_ZK: zk://127.0.0.1:2181/mesos
-    MESOS_HOSTNAME: 127.0.0.1
-    MESOS_IP: 127.0.0.1
-    MESOS_QUORUM: " 1"
-    MESOS_CLUSTER: docker-compose
-    MESOS_WORK_DIR: /var/lib/mesos
+    - MESOS_HOSTNAME=mesos-master
+    - MESOS_CLUSTER=local
+    - MESOS_REGISTRY=in_memory
+    - MESOS_LOG_DIR=/var/log
+    - MESOS_WORK_DIR=/var/lib/mesos
+    - MESOS_ZK=zk://zookeeper:2181/mesos
 
-slave:
-  image: mesosphere/mesos-slave:0.28.1-2.0.20.ubuntu1404
-  net: host
-  pid: host
+mesos-slave:
+  links:
+    - zookeeper
+    - mesos-master
+  image: mesosphere/mesos-slave-dind:0.3.0_mesos-1.0.1_docker-1.10.3_ubuntu-14.04.5
   privileged: true
+  # Uncomment published ports for interactive debugging.
+  # ports:
+  #   - "5051:5051"
   environment:
-    MESOS_MASTER: zk://127.0.0.1:2181/mesos
-    MESOS_HOSTNAME: 127.0.0.1
-    MESOS_IP: 127.0.0.1
-    MESOS_CONTAINERIZERS: docker,mesos
-  volumes:
-    - /sys/fs/cgroup:/sys/fs/cgroup
-    - /usr/bin/docker:/usr/bin/docker:ro
-    - /usr/lib/x86_64-linux-gnu/libapparmor.so.1:/usr/lib/x86_64-linux-gnu/libapparmor.so.1:ro
-    - /var/run/docker.sock:/var/run/docker.sock
-    - /lib/x86_64-linux-gnu/libsystemd-journal.so.0:/lib/x86_64-linux-gnu/libsystemd-journal.so.0
+    - MESOS_HOSTNAME=mesos-slave
+    - MESOS_CONTAINERIZERS=docker,mesos
+    - MESOS_ISOLATOR=cgroups/cpu,cgroups/mem
+    - MESOS_LOG_DIR=/var/log
+    - 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]
 
 marathon:
-  image: mesosphere/marathon:v1.1.1
-  net: host
+  links:
+    - zookeeper
+    - mesos-master
+    - mesos-slave
+  image: mesosphere/marathon:v1.3.12
+  # Uncomment published ports for interactive debugging.
+  # ports:
+  #   - "8080:8080"
+  extra_hosts:
+    - "mesos-slave:172.17.0.1"
   environment:
-    MARATHON_MASTER: zk://127.0.0.1:2181/mesos
-    MARATHON_ZK: zk://127.0.0.1:2181/marathon
-    MARATHON_HOSTNAME: 127.0.0.1
-  command: --event_subscriber http_callback
+    - MARATHON_ZK=zk://zookeeper:2181/marathon
+    - MARATHON_MASTER=zk://zookeeper:2181/mesos