From b41247c6569974d8b8591070076845e652d684ba Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
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/ceph/ceph-base/Dockerfile.j2 | 3 +++
 docker/ceph/ceph-mon/Dockerfile.j2  | 2 ++
 docker/ceph/ceph-osd/Dockerfile.j2  | 2 ++
 docker/ceph/ceph-rgw/Dockerfile.j2  | 2 ++
 4 files changed, 9 insertions(+)

(limited to 'docker/ceph')

diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index aec79be74..19c9c6f80 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block ceph_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2
index f0c084f6b..0627eff00 100644
--- a/docker/ceph/ceph-mon/Dockerfile.j2
+++ b/docker/ceph/ceph-mon/Dockerfile.j2
@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceph_mon_header %}{% endblock %}
+
 COPY fetch_ceph_keys.py /usr/bin/
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2
index 41c0b6d20..3f38fd016 100644
--- a/docker/ceph/ceph-osd/Dockerfile.j2
+++ b/docker/ceph/ceph-osd/Dockerfile.j2
@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceph_osd_header %}{% endblock %}
+
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2
index ccdbdebf7..721bd8f05 100644
--- a/docker/ceph/ceph-rgw/Dockerfile.j2
+++ b/docker/ceph/ceph-rgw/Dockerfile.j2
@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceph_rgw_header %}{% endblock %}
+
 {% block ceph_rgw_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}
-- 
cgit v1.2.3