From 297c15de4b92425286cba2eb3977ec5d877a7e9a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 17 Nov 2020 14:40:32 +0000 Subject: Remove footer block from intermediate images Only the final image in a hierarchy should have the footer block. neutron-infoblox-ipam-agent image still has two footers because it inherits from the neutron-server image. We set the user to root at the beginning of that Dockerfile, so that headers and footers have the right context. Change-Id: I95e5bb5583be2a76e289749e8adfc303a4e7197a (cherry picked from commit 4b792b9a43bee3bfb499cea14924527550f2bce0) --- docker/skydive/skydive-base/Dockerfile.j2 | 1 - 1 file changed, 1 deletion(-) (limited to 'docker/skydive') diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index e1b1efb6b..80a394610 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -27,4 +27,3 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {% block skydive_base_footer %}{% endblock %} -{% block footer %}{% endblock %} -- cgit v1.2.3