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

image_and_tag must be before we use it

Browse source
This commit is contained in:
Joseph Schorr 2014-10-03 13:00:41 -04:00
parent e654b2b608
commit ec42303750
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
workers/dockerfilebuild.py
View file

@ -223,6 +223,13 @@ class DockerfileBuildContext(object):
raise RuntimeError(message) raise RuntimeError(message)
def pull(self): def pull(self):
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)
# Login with the specified credentials (if any). # Login with the specified credentials (if any).
if self._pull_credentials: if self._pull_credentials:
logger.debug('Logging in with pull credentials: %s@%s', logger.debug('Logging in with pull credentials: %s@%s',
@ -238,13 +245,6 @@ class DockerfileBuildContext(object):
registry=self._pull_credentials['registry'], reauth=True) registry=self._pull_credentials['registry'], reauth=True)
# Pull the image, in case it was updated since the last build # Pull the image, in case it was updated since the last build
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, log_data = { self._build_logger('Pulling base image: %s' % image_and_tag, log_data = {
'phasestep': 'pull', 'phasestep': 'pull',
'repo_url': image_and_tag 'repo_url': image_and_tag