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.

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

Make the Mesos containers usable #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
*.swp
6 changes: 3 additions & 3 deletions mesos/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: help

help:
@echo 'Options available:'
@echo ' make images VERSION=0.20.1-1.0.ubuntu1404'
@echo ' make push VERSION=0.20.1-1.0.ubuntu1404'
@echo ' make images VERSION=0.21.0-1.0.debian77'
@echo ' make push VERSION=0.21.0-1.0.debian77'
@echo ''
@echo 'VERSION should be set to the full Ubuntu 14.04 Mesos package version'
@echo 'VERSION should be set to the full Debian 7 Mesos package version'

check-version:
ifndef VERSION
Expand Down
29 changes: 28 additions & 1 deletion mesos/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,28 @@
Note: Mesos should be run with Docker host networking (`--net=host`).
Mesos containers
================

Build
-----

```
make images VERSION=<Debian 7 Mesos pkg version>
```

Run mesos-master
----------------

```
# docker run -d \
--net=host \
mesosphere/mesos-master:<Debian 7 Mesos pkg version>
```

Run mesos-slave
---------------

```
# docker run -d \
-e MESOS_MASTER=<master/zk URL> \
--net=host \
mesosphere/mesos-slave:<Debian 7 Mesos pkg version>
```
Binary file removed mesos/dockerfile-templates/.mesos.swp
Binary file not shown.
14 changes: 9 additions & 5 deletions mesos/dockerfile-templates/mesos
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
FROM ubuntu:14.04
FROM java:7-jre
MAINTAINER Mesosphere <[email protected]>

RUN echo "deb http://repos.mesosphere.io/ubuntu/ trusty main" > /etc/apt/sources.list.d/mesosphere.list
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF
RUN apt-get -y update
RUN apt-get -y install mesos=VERSION
ENV MESOS_LOG_DIR /var/log

RUN \
echo "deb http://repos.mesosphere.io/debian/ wheezy main" > /etc/apt/sources.list.d/mesosphere.list && \
apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF && \
apt-get -y update && \
apt-get -y --no-install-recommends install mesos=VERSION && \
apt-get clean