From 9cd603dfdeffc57e806e016ceb37a05627912a99 Mon Sep 17 00:00:00 2001 From: Michal Jastrzebski Date: Wed, 16 Dec 2015 10:49:46 -0600 Subject: [PATCH] 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 --- docker/base/Dockerfile.j2 | 2 ++ kolla/cmd/build.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9c921373fa..22457700c0 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 6ad393c8b5..b22f0ba81d 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()