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/senlin/senlin-api/Dockerfile.j2 | 1 - docker/senlin/senlin-engine/Dockerfile.j2 | 1 - 2 files changed, 2 deletions(-) (limited to 'docker/senlin') diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index e556b4086..a6ac97ba5 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start {% block senlin_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER senlin diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 625796d07..7a3307d69 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block senlin_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER senlin -- cgit v1.2.3