diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-26 14:39:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-26 14:39:58 +0000 |
| commit | e832e352951655ea1afdfd493b1b6f5055fedd6e (patch) | |
| tree | 5fa7e597f3f0e5ee91c3c8f46b91897b996368d3 | |
| parent | 2844a2510249a200f87d8d173ce5da9f1361757c (diff) | |
| parent | 17aed1ebb3679706982496658c045cb6e441e61d (diff) | |
| download | kolla-e832e352951655ea1afdfd493b1b6f5055fedd6e.tar.gz kolla-e832e352951655ea1afdfd493b1b6f5055fedd6e.zip | |
Merge "Switch Fedora base image to fedora:21"
| -rw-r--r-- | docker/centos/binary/fedora-binary-base/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/centos/binary/hautoproxy/Dockerfile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/centos/binary/fedora-binary-base/Dockerfile b/docker/centos/binary/fedora-binary-base/Dockerfile index f41cac97e..5dff0dfdf 100644 --- a/docker/centos/binary/fedora-binary-base/Dockerfile +++ b/docker/centos/binary/fedora-binary-base/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:20 +FROM fedora:21 MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories @@ -13,6 +13,7 @@ RUN yum update -y && yum clean all # Install base packages RUN yum install -y \ + iproute \ crux \ mariadb \ mariadb-libs \ 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 |