Fix compose_version error. Check has compose before checking version.

reviewable/pr18780/r1
chouseknecht 8 years ago
parent 343c3ecfb9
commit 7f97cf4d04
No known key found for this signature in database
GPG Key ID: 78F1698C5705A81B

@ -484,14 +484,14 @@ class ContainerManager(DockerBaseClass):
if self.files:
self.options[u'--file'] = self.files
if not HAS_COMPOSE:
self.client.fail("Unable to load docker-compose. Try `pip install docker-compose`. Error: %s" % HAS_COMPOSE_EXC)
if LooseVersion(compose_version) < LooseVersion(MINIMUM_COMPOSE_VERSION):
self.client.fail("Found docker-compose version %s. Minimum required version is %s. "
"Upgrade docker-compose to a min version of %s." %
(compose_version, MINIMUM_COMPOSE_VERSION, MINIMUM_COMPOSE_VERSION))
if not HAS_COMPOSE:
self.client.fail("Unable to load docker-compose. Try `pip install docker-compose`. Error: %s" % HAS_COMPOSE_EXC)
self.log("options: ")
self.log(self.options, pretty_print=True)

Loading…
Cancel
Save