openstack
/
kolla
Code Issues Proposed changes

Improve kolla image build script for finding parent images 

This change updates the image script to search for the parent image via the
Docker 'FROM' tag throughout the Dockerfile. The script previously checked
for parent name of an image, assuming that first line of Dockerfile always
starts with FROM, but that is not always the case when using custom
Dockerfiles.

Change-Id: I176d99f4e4896b64435e495526154c8f4c684839
Closes-Bug: #1656206
This commit is contained in:
Chris Suttles 2017-02-21 22:32:19 -08:00
parent 1fbe35815c
commit 07101562e3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kolla/image/build.py
View File

@ -885,8 +885,15 @@ class KollaWorker(object):
image_name = os.path.basename(path)
canonical_name = (self.namespace + '/' + self.image_prefix +
image_name + ':' + self.tag)
parent_search_pattern = re.compile(r'^FROM.*$', re.MULTILINE)
match = re.search(parent_search_pattern, content)
if match:
parent_name = match.group(0).split(' ')[1]
else:
parent_name = ''
del match
image = Image(image_name, canonical_name, path,
parent_name=content.split(' ')[1].split('\n')[0],
parent_name=parent_name,
logger=make_a_logger(self.conf, image_name))
if self.install_type == 'source':