From e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang 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/manila/manila-api/Dockerfile.j2 | 1 - docker/manila/manila-data/Dockerfile.j2 | 1 - docker/manila/manila-scheduler/Dockerfile.j2 | 1 - docker/manila/manila-share/Dockerfile.j2 | 1 - 4 files changed, 4 deletions(-) (limited to 'docker/manila') diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 70908d82c..c2b210a31 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -22,6 +22,5 @@ RUN chmod 755 /usr/local/bin/kolla_manila_extend_start {% block manila_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 4cdeba325..46cae63f1 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -40,6 +40,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block manila_data_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index 56ee3ad3f..28b62b141 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block manila_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 42e8d1d53..d0a99ffd3 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block manila_share_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER manila -- cgit v1.2.3