aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2020-02-19 22:39:33 +0100
committerChristian Berendt <berendt@betacloud-solutions.de>2020-03-01 17:25:58 +0000
commit861f55fbfd7558d56008e6275b0c6f5993346b95 (patch)
tree437d4aea63cc00510b9f9a8ff256b522eed5f6ca /docker/monasca
parentfecd325c67fb7700d86f682be57c1ef456ed7707 (diff)
downloadkolla-861f55fbfd7558d56008e6275b0c6f5993346b95.tar.gz
kolla-861f55fbfd7558d56008e6275b0c6f5993346b95.zip
Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
Diffstat (limited to 'docker/monasca')
-rw-r--r--docker/monasca/monasca-agent/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-api/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-base/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-grafana/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-log-api/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-notification/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-persister/Dockerfile.j22
-rw-r--r--docker/monasca/monasca-thresh/Dockerfile.j22
8 files changed, 16 insertions, 0 deletions
diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2
index b56982a02..24a7f6c96 100644
--- a/docker/monasca/monasca-agent/Dockerfile.j2
+++ b/docker/monasca/monasca-agent/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block monasca_agent_header %}{% endblock %}
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index 97c96d95b..e8337fae1 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block monasca_api_header %}{% endblock %}
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
index aa62f5ee3..fbe6da457 100644
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ b/docker/monasca/monasca-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 monasca_base_header %}{% endblock %}
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2
index c296b8b59..e04bb2bb8 100644
--- a/docker/monasca/monasca-grafana/Dockerfile.j2
+++ b/docker/monasca/monasca-grafana/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block monasca_grafana_header %}{% endblock %}
diff --git a/docker/monasca/monasca-log-api/Dockerfile.j2 b/docker/monasca/monasca-log-api/Dockerfile.j2
index 94d49408d..696a3f666 100644
--- a/docker/monasca/monasca-log-api/Dockerfile.j2
+++ b/docker/monasca/monasca-log-api/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block monasca_log_api_header %}{% endblock %}
diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2
index 1e01101c4..e5bf0ea58 100644
--- a/docker/monasca/monasca-notification/Dockerfile.j2
+++ b/docker/monasca/monasca-notification/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block monasca_notification_header %}{% endblock %}
diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2
index 75c272134..a075ca8f4 100644
--- a/docker/monasca/monasca-persister/Dockerfile.j2
+++ b/docker/monasca/monasca-persister/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block monasca_persister_header %}{% endblock %}
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2
index f76ef50e0..3622f5be5 100644
--- a/docker/monasca/monasca-thresh/Dockerfile.j2
+++ b/docker/monasca/monasca-thresh/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}storm:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
USER root