From 53b2977da3ea0e291da6297ca4ff6bff356a4fff Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sat, 22 Aug 2015 14:20:40 +0000
Subject: [PATCH] Ubuntu - Haproxy
Change-Id: I847eecedd7e6526983d604d2bd95f613e58fffb2
Paritally-Implements: blueprint install-from-ubuntu
---
docker_templates/haproxy/Dockerfile.j2 | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/docker_templates/haproxy/Dockerfile.j2 b/docker_templates/haproxy/Dockerfile.j2
index ba6c76b210..1a40d5d932 100755
--- a/docker_templates/haproxy/Dockerfile.j2
+++ b/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 %}
--
GitLab