aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/hautoproxy/Dockerfile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-26 14:39:58 +0000
committerGerrit Code Review <review@openstack.org>2015-05-26 14:39:58 +0000
commite832e352951655ea1afdfd493b1b6f5055fedd6e (patch)
tree5fa7e597f3f0e5ee91c3c8f46b91897b996368d3 /docker/centos/binary/hautoproxy/Dockerfile
parent2844a2510249a200f87d8d173ce5da9f1361757c (diff)
parent17aed1ebb3679706982496658c045cb6e441e61d (diff)
downloadkolla-e832e352951655ea1afdfd493b1b6f5055fedd6e.tar.gz
kolla-e832e352951655ea1afdfd493b1b6f5055fedd6e.zip
Merge "Switch Fedora base image to fedora:21"
Diffstat (limited to 'docker/centos/binary/hautoproxy/Dockerfile')
-rw-r--r--docker/centos/binary/hautoproxy/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/centos/binary/hautoproxy/Dockerfile b/docker/centos/binary/hautoproxy/Dockerfile
index 82b31eca3..c5c265d0a 100644
--- a/docker/centos/binary/hautoproxy/Dockerfile
+++ b/docker/centos/binary/hautoproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:20
+FROM fedora:21
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install haproxy python-jinja2 && yum clean all