From e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 2 Feb 2017 15:22:36 +0800
Subject: Remove include_header and include_footer in all Dockerfiles

include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
---
 docker/swift/swift-account/Dockerfile.j2        | 1 -
 docker/swift/swift-container/Dockerfile.j2      | 1 -
 docker/swift/swift-object-expirer/Dockerfile.j2 | 1 -
 docker/swift/swift-object/Dockerfile.j2         | 1 -
 docker/swift/swift-proxy-server/Dockerfile.j2   | 1 -
 docker/swift/swift-rsyncd/Dockerfile.j2         | 1 -
 6 files changed, 6 deletions(-)

(limited to 'docker/swift')

diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index f69a7317b..153555cc3 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_account_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index 8bc64b9ec..d1b038f5e 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_container_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index 4ee5c8ec5..f16871648 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_object_expirer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index 60bcc675f..ee7ff2346 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_object_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index d777a10cd..430fd4f5d 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block swift_proxy_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index a34a646e8..d43efa177 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -17,6 +17,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block swift_rsyncd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER swift
-- 
cgit v1.2.3