From 4b792b9a43bee3bfb499cea14924527550f2bce0 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 17 Nov 2020 14:40:32 +0000
Subject: [PATCH] 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
---
 docker/cyborg/cyborg-base/Dockerfile.j2                  | 1 -
 docker/mariadb/mariadb-base/Dockerfile.j2                | 1 -
 docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 | 5 +++++
 docker/ovsdpdk/ovsdpdk/Dockerfile.j2                     | 1 -
 docker/rsyslog/rsyslog-base/Dockerfile.j2                | 1 -
 docker/skydive/skydive-base/Dockerfile.j2                | 1 -
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2
index 51d39fd0fe..9d60c7ab12 100644
--- a/docker/cyborg/cyborg-base/Dockerfile.j2
+++ b/docker/cyborg/cyborg-base/Dockerfile.j2
@@ -37,4 +37,3 @@ RUN chmod 750 /etc/sudoers.d \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start
 
 {% block cyborg_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2
index 26f024599c..bf74281911 100644
--- a/docker/mariadb/mariadb-base/Dockerfile.j2
+++ b/docker/mariadb/mariadb-base/Dockerfile.j2
@@ -25,4 +25,3 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(mariadb_base_packages | customizable("packages")) }}
 
 {% block mariadb_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2
index f8fee5d836..f0a6b30ea5 100644
--- a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2
@@ -3,6 +3,11 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
+# This image inherits from neutron-server image, which is also a leaf image,
+# and therefore sets the user to neutron. Set the user to root, so that any
+# headers or footers used have the right context.
+USER root
+
 {% block neutron_infoblox_ipam_agent_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}
diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
index 45bb2435ce..b125bd876a 100644
--- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
+++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
@@ -34,4 +34,3 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block ovsdpdk_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2
index 54dadd7a84..6689e86f8b 100644
--- a/docker/rsyslog/rsyslog-base/Dockerfile.j2
+++ b/docker/rsyslog/rsyslog-base/Dockerfile.j2
@@ -14,4 +14,3 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(rsyslog_base_packages | customizable("packages")) }}
 
 {% block rsyslog_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2
index b2353142e1..e1533825c9 100644
--- a/docker/skydive/skydive-base/Dockerfile.j2
+++ b/docker/skydive/skydive-base/Dockerfile.j2
@@ -25,4 +25,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 %}