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/sahara/sahara-api/Dockerfile.j2 | 1 - docker/sahara/sahara-engine/Dockerfile.j2 | 2 -- 2 files changed, 3 deletions(-) (limited to 'docker/sahara') diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index 91937f9d8..02dd7e8e8 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start {% block sahara_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER sahara diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index d91b0b73a..84b8b9a36 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block sahara_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER sahara -- cgit v1.2.3