From 59a1c8b9fb91c3f2510b41858431e9a8a935e830 Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Mon, 23 Nov 2015 12:38:58 +0530 Subject: Remove hardcoded MAINTAINER in Dockerfiles Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304 --- kolla/cmd/build.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'kolla/cmd') diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 9ad7104c0..79e674c25 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -242,7 +242,8 @@ def merge_args_and_config(settings_from_config_file): "push": False, "threads": 8, "retries": 3, - "registry": None + "registry": None, + "maintainer": "Kolla Project (https://launchpad.net/kolla)" } defaults.update(settings_from_config_file.items('kolla-build')) parser.set_defaults(**defaults) @@ -361,6 +362,7 @@ class KollaWorker(object): self.image_statuses_bad = dict() self.image_statuses_good = dict() self.image_statuses_unmatched = dict() + self.maintainer = config['maintainer'] def setup_working_dir(self): """Creates a working directory for use while building""" @@ -390,7 +392,8 @@ class KollaWorker(object): 'image_prefix': self.image_prefix, 'install_type': self.install_type, 'namespace': self.namespace, - 'tag': self.tag} + 'tag': self.tag, + 'maintainer': self.maintainer} if self.include_header: with open(self.include_header, 'r') as f: values['include_header'] = f.read() -- cgit v1.2.3