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/magnum/magnum-api/Dockerfile.j2 | 1 - docker/magnum/magnum-conductor/Dockerfile.j2 | 1 - 2 files changed, 2 deletions(-) (limited to 'docker/magnum') diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index a09c057cb..4862b6ebb 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start {% block magnum_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER magnum diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 080ef693b..6e065ec8c 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -27,6 +27,5 @@ RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-re {% block magnum_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER magnum -- cgit v1.2.3