From 9d1ae8ba87759bb6406b114fd3e9bac5166c7022 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 16 Jun 2014 14:01:17 -0400 Subject: [PATCH] FROM line check needs to be on the tuple result, not the join --- workers/dockerfilebuild.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py index 027240287..858a13863 100644 --- a/workers/dockerfilebuild.py +++ b/workers/dockerfilebuild.py @@ -205,11 +205,12 @@ class DockerfileBuildContext(object): registry=self._pull_credentials['registry'], reauth=True) # Pull the image, in case it was updated since the last build - image_and_tag = ':'.join(self._parsed_dockerfile.get_image_and_tag()) - if image_and_tag is None or image_and_tag[0] is None: + image_and_tag_tuple = self._parsed_dockerfile.get_image_and_tag() + if image_and_tag_tuple is None or image_and_tag_tuple[0] is None: self._build_logger('Missing FROM command in Dockerfile', build_logs.ERROR) raise JobException('Missing FROM command in Dockerfile') + image_and_tag = ':'.join(image_and_tag_tuple) self._build_logger('Pulling base image: %s' % image_and_tag) pull_status = self._build_cl.pull(image_and_tag, stream=True)