Move USER operation after footer

The USER operation affects all docker commands after it. This causes a
problem with our {{ include_footer }} implementation since commands in
that footer may require elevated permissions to perform.

In the current implementation I can no longer remove my proxy settings
once the USER has been changed.

Change-Id: I9b2bab5a15f595f6d52a46c64ddf59ba5608b938
Partially-Implements: blueprint drop-root

docker/designate/designate-api/Dockerfile.j2

@@ -14,6 +14,6 @@ RUN yum install -y \
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
-USER designate
-
 {{ include_footer }}
+
+USER designate

docker/designate/designate-backend-bind9/Dockerfile.j2

@@ -12,6 +12,6 @@ RUN yum install -y bind \
     {% endif %}
 {% endif %}
 
-USER designate
-
 {{ include_footer }}
+
+USER designate

docker/designate/designate-central/Dockerfile.j2

@@ -10,6 +10,6 @@ RUN yum install -y openstack-designate-central \
     {% endif %}
 {% endif %}
 
-USER designate
-
 {{ include_footer }}
+
+USER designate

docker/designate/designate-mdns/Dockerfile.j2

@@ -10,6 +10,6 @@ RUN yum install -y openstack-designate-mdns \
     {% endif %}
 {% endif %}
 
-USER designate
-
 {{ include_footer }}
+
+USER designate

docker/designate/designate-poolmanager/Dockerfile.j2

@@ -13,6 +13,6 @@ RUN yum install -y \
     {% endif %}
 {% endif %}
 
-USER designate
-
 {{ include_footer }}
+
+USER designate

docker/designate/designate-sink/Dockerfile.j2

@@ -12,6 +12,6 @@ RUN yum install -y \
     {% endif %}
 {% endif %}
 
-USER designate
-
 {{ include_footer }}
+
+USER designate

docker/glance/glance-api/Dockerfile.j2

@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
-USER glance
-
 {{ include_footer }}
+
+USER glance

docker/glance/glance-registry/Dockerfile.j2

@@ -1,6 +1,6 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-USER glance
-
 {{ include_footer }}
+
+USER glance

docker/heat/heat-api-cfn/Dockerfile.j2

@@ -10,6 +10,6 @@ RUN yum -y install openstack-heat-api-cfn \
     {% endif %}
 {% endif %}
 
-USER heat
-
 {{ include_footer }}
+
+USER heat

docker/heat/heat-api/Dockerfile.j2

@@ -13,6 +13,6 @@ RUN yum -y install openstack-heat-api \
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
-USER heat
-
 {{ include_footer }}
+
+USER heat

docker/heat/heat-engine/Dockerfile.j2

@@ -15,6 +15,6 @@ RUN yum -y install \
     {% endif %}
 {% endif %}
 
-USER heat
-
 {{ include_footer }}
+
+USER heat

docker/horizon/Dockerfile.j2

@@ -75,6 +75,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start \
      && usermod -a -G kolla horizon
 
-USER horizon
-
 {{ include_footer }}
+
+USER horizon

docker/kolla-ansible/Dockerfile.j2

@@ -31,6 +31,6 @@ RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible \
 COPY kolla_keystone_service.py kolla_keystone_user.py /usr/share/ansible/
 COPY ansible.cfg /home/ansible/.ansible.cfg
 
-USER ansible
-
 {{ include_footer }}
+
+USER ansible

docker/mariadb/Dockerfile.j2

@@ -37,7 +37,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
     && chmod 440 /etc/sudoers.d/mariadb_sudoers \
     && usermod -a -G kolla mysql
 
+{{ include_footer }}
 
 USER mysql
-
-{{ include_footer }}