aboutsummaryrefslogtreecommitdiff
path: root/docker/mistral
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2016-09-07 18:15:01 +0100
committerPaul Bourke <paul.bourke@oracle.com>2016-09-13 16:53:31 +0100
commitb41247c6569974d8b8591070076845e652d684ba (patch)
tree88a13a896d3888e71b8e43b84165076d74ee266f /docker/mistral
parent7db277b1459effca5e8b3a13090d7b08639346cc (diff)
downloadkolla-b41247c6569974d8b8591070076845e652d684ba.tar.gz
kolla-b41247c6569974d8b8591070076845e652d684ba.zip
Add header blocks to all Dockerfiles
Change needed to add header blocks to all Dockerfiles, similar to the base. Use case is to easily run something before packages are installed, e.g. to COPY a local rpm in that can be added to the package list. Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee Closes-Bug: 1618969
Diffstat (limited to 'docker/mistral')
-rw-r--r--docker/mistral/mistral-api/Dockerfile.j23
-rw-r--r--docker/mistral/mistral-base/Dockerfile.j22
-rw-r--r--docker/mistral/mistral-engine/Dockerfile.j22
-rw-r--r--docker/mistral/mistral-executor/Dockerfile.j22
4 files changed, 9 insertions, 0 deletions
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 80f0c7871..6d9cb5575 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-api/Dockerfile.j2
@@ -1,5 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
MAINTAINER {{ maintainer }}
+
+{% block mistral_api_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index 5c7c90ed7..e3c5c3e6e 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block mistral_base_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
index ed55401eb..295bc265d 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-engine/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block mistral_engine_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
index e52af6093..b594bbaf4 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/docker/mistral/mistral-executor/Dockerfile.j2
@@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% block mistral_executor_header %}{% endblock %}
+
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}