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/ironic/ironic-api/Dockerfile.j2 | 1 - docker/ironic/ironic-conductor/Dockerfile.j2 | 1 - docker/ironic/ironic-inspector/Dockerfile.j2 | 1 - docker/ironic/ironic-pxe/Dockerfile.j2 | 1 - 4 files changed, 4 deletions(-) (limited to 'docker/ironic') diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 1fd82dcfa..9ff62d23b 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ironic diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index f97e0e475..5841c3901 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -78,6 +78,5 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {% block ironic_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ironic diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 3eae4dab3..d659eb7ff 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -43,6 +43,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block ironic_inspector_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ironic diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index accfeaff2..7540b536a 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -33,4 +33,3 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_pxe_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} -- cgit v1.2.3