diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 11:03:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 11:03:55 +0000 |
| commit | ac04fc04b60a87ea19fa73f7b026607450e451ea (patch) | |
| tree | 0e90a646012cb666d7670bffb815051fbe139b13 /docker | |
| parent | 33fd50e603d48de4f1f2fc25ba649561efc25cac (diff) | |
| parent | e89c156c633a9cafd4529664bc4a5c281cb025ec (diff) | |
| download | kolla-ac04fc04b60a87ea19fa73f7b026607450e451ea.tar.gz kolla-ac04fc04b60a87ea19fa73f7b026607450e451ea.zip | |
Merge "cloud-archive contains newer version of haproxy"
Diffstat (limited to 'docker')
| -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 |