diff options
| author | Jawon Choo <jawon.choo@sk.com> | 2017-05-02 16:23:09 +0900 |
|---|---|---|
| committer | Jawon Choo <jawon.choo@sk.com> | 2017-05-03 11:08:17 +0900 |
| commit | 31259fa595392c25a5e21d03c13e8896648a7695 (patch) | |
| tree | b8450e00c5bc747e3f090284c9161ed9edef9d01 /kolla | |
| parent | 4433a95698da147f3eae8f12b526c2fc204b7a42 (diff) | |
| download | kolla-31259fa595392c25a5e21d03c13e8896648a7695.tar.gz kolla-31259fa595392c25a5e21d03c13e8896648a7695.zip | |
Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.
Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 5c171d94c..ff2409c63 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -704,6 +704,9 @@ class KollaWorker(object): for path in self.docker_build_paths: template_name = "Dockerfile.j2" image_name = path.split("/")[-1] + ts = time.time() + build_date = datetime.datetime.fromtimestamp(ts).strftime( + '%Y%m%d') values = {'base_distro': self.base, 'base_image': self.conf.base_image, 'base_distro_tag': self.base_tag, @@ -718,7 +721,8 @@ class KollaWorker(object): 'kolla_version': kolla_version, 'image_name': image_name, 'users': self.get_users(), - 'rpm_setup': self.rpm_setup} + 'rpm_setup': self.rpm_setup, + 'build_date': build_date} env = jinja2.Environment( # nosec: not used to render HTML loader=jinja2.FileSystemLoader(self.working_dir)) env.filters.update(self._get_filters()) |