From bae7b2b443fb7e60ac2160db74cd81f6bbd82e8a Mon Sep 17 00:00:00 2001 From: Bertrand RETIF Date: Fri, 31 Mar 2017 15:12:07 +0200 Subject: [PATCH 1/2] Add USER to NETWORK_MODES Option USER supported since DCOS 1.7 for overlay network --- marathon/models/container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marathon/models/container.py b/marathon/models/container.py index bb9520b..e291a69 100644 --- a/marathon/models/container.py +++ b/marathon/models/container.py @@ -49,7 +49,7 @@ class MarathonDockerContainer(MarathonObject): :param bool force_pull_image: Force a docker pull before launching """ - NETWORK_MODES = ['BRIDGE', 'HOST', 'NONE'] + NETWORK_MODES = ['BRIDGE', 'HOST', 'NONE', 'USER'] """Valid network modes""" def __init__(self, image=None, network='HOST', port_mappings=None, parameters=None, privileged=None, From 6ca5a304ea2865c1b040e374e141d01e79c0f618 Mon Sep 17 00:00:00 2001 From: Bertrand RETIF Date: Fri, 31 Mar 2017 15:17:05 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0822d97..0e1ab7e 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ pip install marathon #### From GitHub ```bash -pip install -e git+git@github.com:thefactory/marathon-python.git#egg=marathon +pip install git+https://github.com/bretif/marathon-python.git#egg=marathon ``` #### From source