diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-09-07 18:15:01 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-09-13 16:53:31 +0100 |
| commit | b41247c6569974d8b8591070076845e652d684ba (patch) | |
| tree | 88a13a896d3888e71b8e43b84165076d74ee266f /docker/senlin | |
| parent | 7db277b1459effca5e8b3a13090d7b08639346cc (diff) | |
| download | kolla-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/senlin')
| -rw-r--r-- | docker/senlin/senlin-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/senlin/senlin-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/senlin/senlin-engine/Dockerfile.j2 | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index 6be9fd8f0..e556b4086 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block senlin_api_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 index 9c6c783b9..369b0bf4e 100644 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ b/docker/senlin/senlin-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block senlin_base_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 42d5f3cd0..625796d07 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block senlin_engine_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ |