Merge "Add a storm-base image" into stable/train

docker/monasca/monasca-thresh/Dockerfile.j2

@@ -1,8 +1,6 @@
-FROM {{ namespace }}/{{ image_prefix }}storm:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
-USER root
-
 {% block monasca_thresh_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}

docker/storm/storm-base/Dockerfile.j2

@@ -1,7 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
-{% block storm %}{% endblock %}
+{% block storm_base_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}
 
@@ -50,7 +50,4 @@ ENV PYTHON={{ '/usr/bin/python' ~ distro_python_version }}
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
-{% block storm_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER storm
+{% block storm_base_footer %}{% endblock %}

docker/storm/storm/Dockerfile.j2

@@ -0,0 +1,13 @@
+FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block storm_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% block storm_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER storm