Merge "Ubuntu - Haproxy"

docker_templates/haproxy/Dockerfile.j2

@@ -7,10 +7,15 @@ RUN yum -y install \
         haproxy \
     && yum clean all
 
-{% elif base_distro in ['ubuntu', 'debian'] %}
+{% elif base_distro == 'ubuntu' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+RUN apt-get install -y --no-install-recommends -t trusty-backports haproxy \
+    && apt-get clean
+
+{% elif base_distro == 'debian' %}
+
+RUN apt-get install -y --no-install-recommends haproxy \
+    && apt-get clean
 
 {% endif %}