Merge pull request #648 from containous/update-marathon
Update marathon
This commit is contained in:
commit
f4520a011a
1 changed files with 58 additions and 42 deletions
|
@ -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:
|
||||||
environment:
|
image: netflixoss/exhibitor:1.5.2
|
||||||
MESOS_ZK: zk://127.0.0.1:2181/mesos
|
hostname: zookeeper
|
||||||
MESOS_HOSTNAME: 127.0.0.1
|
ports:
|
||||||
MESOS_IP: 127.0.0.1
|
- "2181:2181"
|
||||||
MESOS_QUORUM: 1
|
mesos-master:
|
||||||
MESOS_CLUSTER: docker-compose
|
image: mesosphere/marathon:v1.2.0-RC6
|
||||||
MESOS_WORK_DIR: /var/lib/mesos
|
hostname: mesos-master
|
||||||
|
entrypoint: [ "mesos-master" ]
|
||||||
slave:
|
ports:
|
||||||
image: mesosphere/mesos-slave:0.28.1-2.0.20.ubuntu1404
|
- "5050:5050"
|
||||||
net: host
|
links:
|
||||||
pid: host
|
- zookeeper
|
||||||
privileged: true
|
environment:
|
||||||
environment:
|
- MESOS_CLUSTER=local
|
||||||
MESOS_MASTER: zk://127.0.0.1:2181/mesos
|
- MESOS_HOSTNAME=mesos-master.docker
|
||||||
MESOS_HOSTNAME: 127.0.0.1
|
- MESOS_LOG_DIR=/var/log
|
||||||
MESOS_IP: 127.0.0.1
|
- MESOS_WORK_DIR=/var/lib/mesos
|
||||||
MESOS_CONTAINERIZERS: docker,mesos
|
- MESOS_QUORUM=1
|
||||||
volumes:
|
- MESOS_ZK=zk://zookeeper:2181/mesos
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup
|
mesos-slave:
|
||||||
- /usr/bin/docker:/usr/bin/docker:ro
|
image: mesosphere/mesos-slave-dind:0.2.4_mesos-0.27.2_docker-1.8.2_ubuntu-14.04.4
|
||||||
- /usr/lib/x86_64-linux-gnu/libapparmor.so.1:/usr/lib/x86_64-linux-gnu/libapparmor.so.1:ro
|
entrypoint:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- mesos-slave
|
||||||
- /lib/x86_64-linux-gnu/libsystemd-journal.so.0:/lib/x86_64-linux-gnu/libsystemd-journal.so.0
|
privileged: true
|
||||||
|
hostname: mesos-slave
|
||||||
marathon:
|
ports:
|
||||||
image: mesosphere/marathon:v1.1.1
|
- "5051:5051"
|
||||||
net: host
|
links:
|
||||||
environment:
|
- zookeeper
|
||||||
MARATHON_MASTER: zk://127.0.0.1:2181/mesos
|
- mesos-master
|
||||||
MARATHON_ZK: zk://127.0.0.1:2181/marathon
|
environment:
|
||||||
MARATHON_HOSTNAME: 127.0.0.1
|
- MESOS_CONTAINERIZERS=docker,mesos
|
||||||
command: --event_subscriber http_callback
|
- 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]
|
||||||
|
volumes:
|
||||||
|
- "/var/run/docker.sock:/var/run/docker.sock"
|
||||||
|
marathon:
|
||||||
|
image: mesosphere/marathon:v1.2.0-RC6
|
||||||
|
ports:
|
||||||
|
- "8080:8080"
|
||||||
|
links:
|
||||||
|
- zookeeper
|
||||||
|
- mesos-master
|
||||||
|
extra_hosts:
|
||||||
|
- "mesos-slave:172.17.0.1"
|
||||||
|
environment:
|
||||||
|
- MARATHON_ZK=zk://zookeeper:2181/marathon
|
||||||
|
- MARATHON_MASTER=zk://zookeeper:2181/mesos
|
Loading…
Reference in a new issue