vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

FROM line check needs to be on the tuple result, not the join

Browse source
This commit is contained in:
Joseph Schorr 2014-06-16 14:01:17 -04:00
parent f795868b5b
commit 9d1ae8ba87
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
workers/dockerfilebuild.py
View file

@ -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)