diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-06 04:19:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-06 04:19:59 +0000 |
| commit | 74d836659c771f0271f140885fffb7c9e0844812 (patch) | |
| tree | 26d4d50790a4b7c7d4a8755bca27198740d5f88d | |
| parent | 5076268296b7b56bbb4cffac9ba13809e6f8b955 (diff) | |
| parent | 06ce7be1c34404bb0a6a168a0c0887eaf942ffca (diff) | |
| download | kolla-74d836659c771f0271f140885fffb7c9e0844812.tar.gz kolla-74d836659c771f0271f140885fffb7c9e0844812.zip | |
Merge "Add header blocks to Dockerfiles"
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index b5a2b4bb8..1269bced8 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block kuryr_base_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index 9f5f615d2..7f64cf4da 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block kuryr_libnetwork_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ |