Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Zookeeper and Mesos images #783

Merged
merged 1 commit into from
Oct 6, 2016
Merged

Update Zookeeper and Mesos images #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ https://mesosphere.github.io/marathon/docs/marathon-ui.html.
1. 🤖 Set up Mesos and Marathon following this
[tutorial](https://mesosphere.github.io/marathon/docs/) and install a CORS
proxy on your machine.
2. 🐳 Use the handy docker-based setup
2. 🐳 Use the handy docker-based setup - *Please be aware that it's currently
not possible to launch Docker containers with this setup.*

___

Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
zookeeper:
image: netflixoss/exhibitor:1.5.2
image: zookeeper:3.4.9
hostname: zookeeper
ports:
- "2181:2181"
mesos-master:
image: mesosphere/mesos-master:0.27.2-2.0.15.ubuntu1404
image: mesosphere/mesos-master:1.0.11.0.1-2.0.93.ubuntu1404
hostname: mesos-master
entrypoint: [ "mesos-master" ]
ports:
Expand All @@ -24,7 +24,7 @@ mesos-master:
volumes:
- ./resources/mesos-config:/mesos-config
mesos-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:1.0.11.0.1-2.0.93.ubuntu1404
entrypoint:
- mesos-slave
privileged: true
Expand All @@ -35,7 +35,7 @@ mesos-slave:
- zookeeper
- mesos-master
environment:
- MESOS_CONTAINERIZERS=docker,mesos
- MESOS_CONTAINERIZERS=mesos
- MESOS_ISOLATOR=cgroups/cpu, cgroups/mem
- MESOS_LOG_DIR=var/log
- MESOS_MASTER=zk://zookeeper:2181/mesos
Expand Down