diff options
| author | Michal Jastrzebski <michal.jastrzebski@intel.com> | 2015-12-16 10:49:46 -0600 |
|---|---|---|
| committer | Michal Rostecki <mrostecki@mirantis.com> | 2015-12-17 17:55:04 +0000 |
| commit | 9cd603dfdeffc57e806e016ceb37a05627912a99 (patch) | |
| tree | 123d1eaf8f17fb00c48c43ae92fa14e65a2f842f | |
| parent | 03fd08d867ec7967d2f0ec8813d865ea25a93a06 (diff) | |
| download | kolla-9cd603dfdeffc57e806e016ceb37a05627912a99.tar.gz kolla-9cd603dfdeffc57e806e016ceb37a05627912a99.zip | |
Add kolla version to base container
We want to record kolla version of running containers to be able to
detect whether or not we need to perform certain downtime-causing
actions during upgrade.
Change-Id: Ie113029da98303e6809d56edbf6d8de37be128d7
Implements: blueprint record-version
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | kolla/cmd/build.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9c921373f..22457700c 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ base_distro }}:{{ base_distro_tag }} MAINTAINER {{ maintainer }} +LABEL kolla_version="{{ kolla_version }}" + {# Early failure for bases and types #} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if install_type not in ['source', 'binary', 'rdo', 'rhel'] %} diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 6ad393c8b..b22f0ba81 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -434,7 +434,8 @@ class KollaWorker(object): 'install_type': self.install_type, 'namespace': self.namespace, 'tag': self.tag, - 'maintainer': self.maintainer} + 'maintainer': self.maintainer, + 'kolla_version': get_kolla_version()} if self.include_header: with open(self.include_header, 'r') as f: values['include_header'] = f.read() |