aboutsummaryrefslogtreecommitdiff
path: root/docker/ovn
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/ovn
parent9c0cfce9f32da87b395c916919bec054d744f311 (diff)
parent861f55fbfd7558d56008e6275b0c6f5993346b95 (diff)
downloadkolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.tar.gz
kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.zip
Merge "Add block labels to all Dockerfiles"
Diffstat (limited to 'docker/ovn')
-rw-r--r--docker/ovn/ovn-base/Dockerfile.j22
-rw-r--r--docker/ovn/ovn-controller/Dockerfile.j22
-rw-r--r--docker/ovn/ovn-nb-db-server/Dockerfile.j22
-rw-r--r--docker/ovn/ovn-northd/Dockerfile.j22
-rw-r--r--docker/ovn/ovn-sb-db-server/Dockerfile.j22
5 files changed, 10 insertions, 0 deletions
diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2
index d0c837873..86e6ca425 100644
--- a/docker/ovn/ovn-base/Dockerfile.j2
+++ b/docker/ovn/ovn-base/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block ovn_base_header %}{% endblock %}
diff --git a/docker/ovn/ovn-controller/Dockerfile.j2 b/docker/ovn/ovn-controller/Dockerfile.j2
index 334a7f972..ef4d05ddc 100644
--- a/docker/ovn/ovn-controller/Dockerfile.j2
+++ b/docker/ovn/ovn-controller/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block ovn_controller_header %}{% endblock %}
diff --git a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/docker/ovn/ovn-nb-db-server/Dockerfile.j2
index ac5be8886..ecc94651b 100644
--- a/docker/ovn/ovn-nb-db-server/Dockerfile.j2
+++ b/docker/ovn/ovn-nb-db-server/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block ovn_nb_db_server_header %}{% endblock %}
diff --git a/docker/ovn/ovn-northd/Dockerfile.j2 b/docker/ovn/ovn-northd/Dockerfile.j2
index a8af3f209..2c94f2f20 100644
--- a/docker/ovn/ovn-northd/Dockerfile.j2
+++ b/docker/ovn/ovn-northd/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block ovn_northd_header %}{% endblock %}
diff --git a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/docker/ovn/ovn-sb-db-server/Dockerfile.j2
index 2ebae7267..9acd01fa3 100644
--- a/docker/ovn/ovn-sb-db-server/Dockerfile.j2
+++ b/docker/ovn/ovn-sb-db-server/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block ovn_sb_db_server_header %}{% endblock %}