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/watcher | |
| 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/watcher')
| -rw-r--r-- | docker/watcher/watcher-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-applier/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-engine/Dockerfile.j2 | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index d428f69d4..03fc31c28 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_api_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index a3469103c..9a5ffa573 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_applier_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 5e475f562..1e695dc0b 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_base_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index bae251c92..3b924d0c7 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_engine_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ |