Merge "Remove footer block from intermediate images"

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}