aboutsummaryrefslogtreecommitdiff
path: root/docker/aodh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-14 05:16:11 +0000
committerGerrit Code Review <review@openstack.org>2016-09-14 05:16:11 +0000
commitba32530faca434c0ef7ca3290b9bf17825342694 (patch)
tree2c2342f3be779a26e93023c026d93cd5fb6445f3 /docker/aodh
parentae9c246315d72f5acb724b9fa93886cc30b48cec (diff)
parentb41247c6569974d8b8591070076845e652d684ba (diff)
downloadkolla-ba32530faca434c0ef7ca3290b9bf17825342694.tar.gz
kolla-ba32530faca434c0ef7ca3290b9bf17825342694.zip
Merge "Add header blocks to all Dockerfiles"
Diffstat (limited to 'docker/aodh')
-rw-r--r--docker/aodh/aodh-api/Dockerfile.j23
-rw-r--r--docker/aodh/aodh-base/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-evaluator/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-expirer/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-listener/Dockerfile.j22
-rw-r--r--docker/aodh/aodh-notifier/Dockerfile.j22
6 files changed, 13 insertions, 0 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
index 275be3aff..23288c9b0 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/docker/aodh/aodh-api/Dockerfile.j2
@@ -1,5 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
MAINTAINER {{ maintainer }}
+
+{% block aodh_api_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index 68d2c4a20..ad9cd4375 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block aodh_base_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2
index f6b258f73..342d4b1c9 100644
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ b/docker/aodh/aodh-evaluator/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block aodh_evaluator_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2
index e893dd06b..235c7d369 100644
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ b/docker/aodh/aodh-expirer/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block aodh_expirer_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2
index 2d2afcf9b..894d44f67 100644
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ b/docker/aodh/aodh-listener/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block aodh_listener_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2
index 8775a3a1a..c83de2af5 100644
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ b/docker/aodh/aodh-notifier/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block aodh_notifier_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}