diff options
| author | SamYaple <sam@yaple.net> | 2016-02-23 00:42:48 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-23 00:42:48 +0000 |
| commit | e89c156c633a9cafd4529664bc4a5c281cb025ec (patch) | |
| tree | 690b8a1255be1a01d4ecbf4f767e18dc7eb32091 /docker/haproxy | |
| parent | 9e2c11cb3e97dd2294a7e84b6ef8cdd218435588 (diff) | |
| download | kolla-e89c156c633a9cafd4529664bc4a5c281cb025ec.tar.gz kolla-e89c156c633a9cafd4529664bc4a5c281cb025ec.zip | |
cloud-archive contains newer version of haproxy
cloud-archive contains at least version 1.5 of haproxy and that is
new enough for ssl offloading.
TrivialFix
Change-Id: Ib306e54b455430fdc9be896e8d14784ef1feb011
Diffstat (limited to 'docker/haproxy')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index bc040d178..e4ee3664d 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/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 |