Fix 'all' option for published_ports parameter.

reviewable/pr18780/r1
Chris Houseknecht 8 years ago
parent a606e9cd37
commit e51024c84d

@ -202,7 +202,7 @@ options:
- fluentd - fluentd
- awslogs - awslogs
- splunk - splunk
defult: json-file default: json-file
required: false required: false
log_options: log_options:
description: description:
@ -727,14 +727,17 @@ class TaskParameters(DockerBaseClass):
except ValueError as exc: except ValueError as exc:
self.fail("Failed to convert %s to bytes: %s" % (param_name, 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 = True
self.published_ports = None
self.ports = None
else:
self.publish_all_ports = False
self.published_ports = self._parse_publish_ports() 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("expose ports:")
self.log(self.ports, pretty_print=True) self.log(self.ports, pretty_print=True)
self.publish_all_ports = None
if self.published_ports == 'all':
self.publish_all_ports = True
self.published_ports = None
self.links = self._parse_links(self.links) self.links = self._parse_links(self.links)

Loading…
Cancel
Save