diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-26 16:58:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-26 16:58:10 +0000 |
| commit | 5ad8635b6dc85f7d8e1b072ea12499ed94062ed2 (patch) | |
| tree | b2c58f93565264e4d272b692a3e109666e249e78 | |
| parent | 22a07075d278d592bccfe9ca3fc1b670248d706d (diff) | |
| parent | 6b6c9840dc2a7052258ee4b92838eb154f88f232 (diff) | |
| download | kolla-5ad8635b6dc85f7d8e1b072ea12499ed94062ed2.tar.gz kolla-5ad8635b6dc85f7d8e1b072ea12499ed94062ed2.zip | |
Merge "Update haproxy dockerfile for formatting"
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 38f5dc5c1..d21969629 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -3,12 +3,14 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install haproxy \ +RUN yum -y install \ + haproxy \ && yum clean all {% 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 {% endif %} |