From 1058094b64cce2d840623d880870030220d7ff19 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 12 Jul 2016 12:37:38 -0400 Subject: [PATCH] Fix module failing when no ports are exposed --- cloud/docker/docker_container.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cloud/docker/docker_container.py b/cloud/docker/docker_container.py index 30834a1992a..5ef10653c9f 100644 --- a/cloud/docker/docker_container.py +++ b/cloud/docker/docker_container.py @@ -126,7 +126,7 @@ options: description: - List of additional container ports to expose for port mappings or links. If the port is already exposed using EXPOSE in a Dockerfile, it does not - need to be xposed again. + need to be exposed again. default: null required: false aliases: @@ -738,15 +738,13 @@ class TaskParameters(DockerBaseClass): except ValueError as exc: self.fail("Failed to convert %s to bytes: %s" % (param_name, exc)) - if 'all' in (port.lower() if isinstance(port, basestring) else port for port in self.published_ports): + self.publish_all_ports = False + self.published_ports = self._parse_publish_ports() + if self.published_ports == 'all': self.publish_all_ports = True self.published_ports = None - self.ports = None - else: - self.publish_all_ports = False - self.published_ports = self._parse_publish_ports() - self.ports = self._parse_exposed_ports(self.published_ports) + self.ports = self._parse_exposed_ports(self.published_ports) self.log("expose ports:") self.log(self.ports, pretty_print=True)