aboutsummaryrefslogtreecommitdiff
path: root/docker/zun
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-02 12:26:57 +0000
committerGerrit Code Review <review@openstack.org>2020-03-02 12:26:57 +0000
commit3fe2ae7849ef963227b1cd46c5b13d646de789c3 (patch)
treec194e30e63570fad715b0bcedd8194d238424ab9 /docker/zun
parent9c0cfce9f32da87b395c916919bec054d744f311 (diff)
parent861f55fbfd7558d56008e6275b0c6f5993346b95 (diff)
downloadkolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.tar.gz
kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.zip
Merge "Add block labels to all Dockerfiles"
Diffstat (limited to 'docker/zun')
-rw-r--r--docker/zun/zun-api/Dockerfile.j22
-rw-r--r--docker/zun/zun-base/Dockerfile.j22
-rw-r--r--docker/zun/zun-compute/Dockerfile.j22
-rw-r--r--docker/zun/zun-wsproxy/Dockerfile.j22
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2
index 19e73ffb0..75b278a2b 100644
--- a/docker/zun/zun-api/Dockerfile.j2
+++ b/docker/zun/zun-api/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block zun_api_header %}{% endblock %}
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2
index cb31c9ef8..b3c4946b8 100644
--- a/docker/zun/zun-base/Dockerfile.j2
+++ b/docker/zun/zun-base/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block zun_base_header %}{% endblock %}
diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2
index df0870435..bb96149e1 100644
--- a/docker/zun/zun-compute/Dockerfile.j2
+++ b/docker/zun/zun-compute/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block zun_compute_header %}{% endblock %}
diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2
index 4c14c5072..3663262f7 100644
--- a/docker/zun/zun-wsproxy/Dockerfile.j2
+++ b/docker/zun/zun-wsproxy/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block zun_wsproxy_header %}{% endblock %}