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/heat/heat-api-cfn/Dockerfile.j2 | 1 - docker/heat/heat-api/Dockerfile.j2 | 1 - docker/heat/heat-engine/Dockerfile.j2 | 2 -- 3 files changed, 4 deletions(-) (limited to 'docker/heat') diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0654edbfa..71ad40e8e 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }} {% block heat_api_cfn_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heat diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index d7486cc7b..4ed685f53 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start {% block heat_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heat diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 48b600695..98339e0e5 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -21,6 +21,4 @@ MAINTAINER {{ maintainer }} {% block heat_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER heat -- cgit v1.2.3