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/karbor/karbor-api/Dockerfile.j2 | 1 - docker/karbor/karbor-operationengine/Dockerfile.j2 | 1 - docker/karbor/karbor-protection/Dockerfile.j2 | 1 - 3 files changed, 3 deletions(-) (limited to 'docker/karbor') diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 index d8bbe7818..9be12b521 100644 --- a/docker/karbor/karbor-api/Dockerfile.j2 +++ b/docker/karbor/karbor-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start {% block karbor_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER karbor diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 index 745fcd4a8..99beb28ae 100644 --- a/docker/karbor/karbor-operationengine/Dockerfile.j2 +++ b/docker/karbor/karbor-operationengine/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block karbor_operationengine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER karbor diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 index 9be5cca0b..28ddf5f4c 100644 --- a/docker/karbor/karbor-protection/Dockerfile.j2 +++ b/docker/karbor/karbor-protection/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block karbor_protection_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER karbor -- cgit v1.2.3