diff options
author | aiordache <anca.iordache@docker.com> | 2020-08-10 18:15:18 +0200 |
---|---|---|
committer | aiordache <anca.iordache@docker.com> | 2020-08-10 19:15:50 +0200 |
commit | 8080fbb4ed7a5c25fa0bf1deb39bcdf4cdfb7ddd (patch) | |
tree | 96f8d76aaa1eb9da05e852db91567afd70d35b72 | |
parent | 746a2509ab7cb0656f62de0440be9ce442775e8c (diff) | |
download | docker-py-8080fbb4ed7a5c25fa0bf1deb39bcdf4cdfb7ddd.tar.gz |
Fix merge
Signed-off-by: aiordache <anca.iordache@docker.com>
-rw-r--r-- | docker/context/context.py | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/docker/context/context.py b/docker/context/context.py index 8158803..2413b2e 100644 --- a/docker/context/context.py +++ b/docker/context/context.py @@ -186,8 +186,6 @@ class Context: @property def Host(self): -<<<<<<< HEAD -<<<<<<< HEAD if not self.orchestrator or self.orchestrator == "swarm": endpoint = self.endpoints.get("docker", None) if endpoint: @@ -195,14 +193,6 @@ class Context: return None return self.endpoints[self.orchestrator].get("Host", None) -======= - if self.orchestrator == "swarm": -======= - if not self.orchestrator or self.orchestrator == "swarm": ->>>>>>> 1e11ece... Make orchestrator field optional - return self.endpoints["docker"]["Host"] - return self.endpoints[self.orchestrator]["Host"] ->>>>>>> 64fdb32... Implement context management, lifecycle and unittests. @property def Orchestrator(self): @@ -210,44 +200,19 @@ class Context: @property def Metadata(self): -<<<<<<< HEAD -<<<<<<< HEAD - meta = {} - if self.orchestrator: - meta = {"StackOrchestrator": self.orchestrator} - return { - "Name": self.name, - "Metadata": meta, -======= - return { - "Name": self.name, - "Metadata": { - "StackOrchestrator": self.orchestrator - }, ->>>>>>> 64fdb32... Implement context management, lifecycle and unittests. -======= meta = {} if self.orchestrator: meta = {"StackOrchestrator": self.orchestrator} return { "Name": self.name, "Metadata": meta, ->>>>>>> 1e11ece... Make orchestrator field optional "Endpoints": self.endpoints } @property def TLSConfig(self): key = self.orchestrator -<<<<<<< HEAD -<<<<<<< HEAD - if not key or key == "swarm": -======= - if key == "swarm": ->>>>>>> 64fdb32... Implement context management, lifecycle and unittests. -======= if not key or key == "swarm": ->>>>>>> 1e11ece... Make orchestrator field optional key = "docker" if key in self.tls_cfg.keys(): return self.tls_cfg[key] |