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/openvswitch/openvswitch-base/Dockerfile.j2      | 3 +++
 docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 ++
 docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2  | 2 ++
 3 files changed, 7 insertions(+)

(limited to 'docker/openvswitch')

diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
index b41cc2634..5dbe14c1c 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block openvswitch_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index 1cc28e168..cf85de2bd 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block openvswitch_db_server_header %}{% endblock %}
+
 COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
 COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
 COPY start_ovsdb_server.sh /usr/local/bin/start-ovsdb-server
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index 5e6880ce5..ef7a5e6ed 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block openvswitch_vswitchd_header %}{% endblock %}
+
 COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
 RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
 
-- 
cgit v1.2.3