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/mistral/mistral-api/Dockerfile.j2 | 1 - docker/mistral/mistral-engine/Dockerfile.j2 | 2 -- docker/mistral/mistral-executor/Dockerfile.j2 | 2 -- 3 files changed, 5 deletions(-) (limited to 'docker/mistral') diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 579f005dc..b393cffdc 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start {% block mistral_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER mistral diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 458ff881e..a054d128b 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block mistral_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER mistral diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 382d0e33c..ac68130ae 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block mistral_executor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER mistral -- cgit v1.2.3