diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-25 05:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-25 05:03:24 +0000 |
| commit | aa7b6f4873bccdbe3fcce2d4f20c3ad887dce025 (patch) | |
| tree | 779c7c8f1b6c8cce9532d3037581a8329cf09de8 | |
| parent | 2864b46957e7fbe830dc8d56a5f3915cc5aa8a2b (diff) | |
| parent | 53b2977da3ea0e291da6297ca4ff6bff356a4fff (diff) | |
| download | kolla-aa7b6f4873bccdbe3fcce2d4f20c3ad887dce025.tar.gz kolla-aa7b6f4873bccdbe3fcce2d4f20c3ad887dce025.zip | |
Merge "Ubuntu - Haproxy"
| -rwxr-xr-x | docker_templates/haproxy/Dockerfile.j2 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/docker_templates/haproxy/Dockerfile.j2 b/docker_templates/haproxy/Dockerfile.j2 index ba6c76b21..1a40d5d93 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 %} |