diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-28 17:23:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-28 17:23:01 +0000 |
| commit | b094aca837ff365a38a1b5f563fc2fb2cb288dd3 (patch) | |
| tree | cb4906813d6cff144cde2a40c57f8243d88c5c62 | |
| parent | 60021eced02248e140a3fb75d80d7cff05bf821d (diff) | |
| parent | 07101562e3eb477dbb1246f8c2097143de4e6327 (diff) | |
| download | kolla-b094aca837ff365a38a1b5f563fc2fb2cb288dd3.tar.gz kolla-b094aca837ff365a38a1b5f563fc2fb2cb288dd3.zip | |
Merge "Improve kolla image build script for finding parent images"
| -rwxr-xr-x | kolla/image/build.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index f7719d54f..133063513 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -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': |