diff options
| author | Zuul <zuul@review.opendev.org> | 2026-09-22 23:23:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-09-22 23:23:44 +0000 |
| commit | 4e2c9782c4608231e39a5558d04e7b6b6715871f (patch) | |
| tree | e9be7d29fff11d6cc2fc732ee600affb56747a3c /kolla/image | |
| parent | cd36091e3b20a33df27cae4130085b75c3f9dcab (diff) | |
| parent | de7c08d5b9ab240328609ebcfa4648e0d6f7f0ab (diff) | |
| download | kolla-4e2c9782c4608231e39a5558d04e7b6b6715871f.tar.gz kolla-4e2c9782c4608231e39a5558d04e7b6b6715871f.zip | |
Merge "Allow lowercase from"
Diffstat (limited to 'kolla/image')
| -rw-r--r-- | kolla/image/kolla_worker.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kolla/image/kolla_worker.py b/kolla/image/kolla_worker.py index 92908a6c1..837bd797c 100644 --- a/kolla/image/kolla_worker.py +++ b/kolla/image/kolla_worker.py @@ -423,7 +423,7 @@ class KollaWorker(object): if pip_args: lines = content.split('\n') for i, line in enumerate(lines): - if line.startswith('FROM '): + if re.match(r'^FROM\s', line, re.IGNORECASE): lines[i + 1:i + 1] = pip_args break content = '\n'.join(lines) @@ -756,7 +756,8 @@ 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) + parent_search_pattern = re.compile(r'^FROM.*$', + re.MULTILINE | re.IGNORECASE) match = re.search(parent_search_pattern, content) if match: parent_name = match.group(0).split(' ')[1] |