Skip to content

Mesos container support #154

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

Merged
solarkennedy merged 3 commits into from
Oct 20, 2016
Merged

Mesos container support #154

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5edf51e
Add support for MESOS container type
tanderegg Oct 19, 2016
e91ff09
Check for docker==None
tanderegg Oct 19, 2016
9f2479d
Removed whitespace to comply with pep8
tanderegg Oct 19, 2016
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
9 changes: 6 additions & 3 deletions marathon/models/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@ class MarathonContainer(MarathonObject):
:type volumes: list[:class:`marathon.models.container.MarathonContainerVolume`] or list[dict]
"""

TYPES = ['DOCKER']
TYPES = ['DOCKER', 'MESOS']
"""Valid container types"""

def __init__(self, docker=None, type='DOCKER', volumes=None):
if type not in self.TYPES:
raise InvalidChoiceError('type', type, self.TYPES)
self.type = type
self.docker = docker if isinstance(docker, MarathonDockerContainer) \
else MarathonDockerContainer().from_json(docker)

if docker:
self.docker = docker if isinstance(docker, MarathonDockerContainer) \
else MarathonDockerContainer().from_json(docker)

self.volumes = [
v if isinstance(
v, MarathonContainerVolume) else MarathonContainerVolume().from_json(v)
Expand Down