From b41247c6569974d8b8591070076845e652d684ba Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 7 Sep 2016 18:15:01 +0100 Subject: 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 --- docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 2 ++ docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 2 ++ docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 | 2 ++ 3 files changed, 6 insertions(+) (limited to 'docker/cloudkitty') diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index cdbff832d..897808b1d 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block cloudkitty_api_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 839d29b5a..ff01520d2 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block cloudkitty_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 0b0c0d250..9d78b260f 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block cloudkitty_processor_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} -- cgit v1.2.3