openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update haproxy dockerfile for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-26 16:58:10 +00:00 committed by Gerrit Code Review
commit 5ad8635b6d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/haproxy/Dockerfile.j2
View File

@ -3,12 +3,14 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install haproxy \ RUN yum -y install \
haproxy \
&& yum clean all && yum clean all
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
RUN apt-get install -y --no-install-recommends haproxy \ RUN apt-get install -y --no-install-recommends \
haproxy \
&& apt-get clean && apt-get clean
{% endif %} {% endif %}