aboutsummaryrefslogtreecommitdiff
path: root/docker/murano
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-08 21:33:04 +0000
committerGerrit Code Review <review@openstack.org>2017-05-08 21:33:04 +0000
commit5841abe910c50d34fbbf4dcfde7b6e92dd82bdae (patch)
treef36a0b490406bdc99ae5090d2fd782e7dc8fd08e /docker/murano
parent9751b32a7b37e12fab19a6a99c98c4c58f348a6d (diff)
parent31259fa595392c25a5e21d03c13e8896648a7695 (diff)
downloadkolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.tar.gz
kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.zip
Merge "Override image's meta info."
Diffstat (limited to 'docker/murano')
-rw-r--r--docker/murano/murano-api/Dockerfile.j22
-rw-r--r--docker/murano/murano-base/Dockerfile.j22
-rw-r--r--docker/murano/murano-engine/Dockerfile.j22
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index d44913386..9c5d71fec 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block murano_api_header %}{% endblock %}
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index 36b55c5ef..cb428c80a 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block murano_base_header %}{% endblock %}
diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2
index 1de0e69b9..2761f77d7 100644
--- a/docker/murano/murano-engine/Dockerfile.j2
+++ b/docker/murano/murano-engine/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block murano_engine_header %}{% endblock %}