openstack/kolla-ansible
Code Issues Proposed changes

Merge "cloud-archive contains newer version of haproxy"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 11:03:55 +00:00 committed by Gerrit Code Review
commit ac04fc04b6
1 changed files with 1 additions and 6 deletions

7
docker/haproxy/Dockerfile.j2

@ -6,12 +6,7 @@ MAINTAINER {{ maintainer }}
RUN yum -y install haproxy \
&& yum clean all
{% elif base_distro == 'ubuntu' %}
RUN apt-get install -y --no-install-recommends -t trusty-backports haproxy \
&& apt-get clean
{% elif base_distro == 'debian' %}
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN apt-get install -y --no-install-recommends haproxy \
&& apt-get clean