Skip to content

Add parameters and privileged fields to Container model #17

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
mbabineau merged 1 commit into from
Dec 1, 2014
Merged

Add parameters and privileged fields to Container model #17

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
6 changes: 5 additions & 1 deletion marathon/models/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ class MarathonDockerContainer(MarathonObject):
:param str network:
:param port_mappings:
:type port_mappings: list[:class:`marathon.models.container.MarathonContainerPortMapping`] or list[dict]
:param dict parameters:
:param bool privileged: run container in privileged mode
"""

NETWORK_MODES=['BRIDGE', 'HOST']
"""Valid network modes"""

def __init__(self, image=None, network='HOST', port_mappings=None):
def __init__(self, image=None, network='HOST', port_mappings=None, parameters=None, privileged=None):
self.image = image
if network:
if not network in self.NETWORK_MODES:
Expand All @@ -53,6 +55,8 @@ def __init__(self, image=None, network='HOST', port_mappings=None):
pm if isinstance(pm, MarathonContainerPortMapping) else MarathonContainerPortMapping().from_json(pm)
for pm in (port_mappings or [])
]
self.parameters = parameters or {}
self.privileged = privileged or False


class MarathonContainerPortMapping(MarathonObject):
Expand Down