diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-29 01:10:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-29 01:10:45 +0000 |
| commit | a42298dddd28724bbaede765df54e563ede77f9f (patch) | |
| tree | effb4b4bd295e4a1ea99d0777ee515387487fda3 | |
| parent | 87f96b8b181a90bfa57ce0ca26a89bbdd7cc2af8 (diff) | |
| parent | 495999fa56f11109e622a5e42476bd8df013c2dc (diff) | |
| download | kolla-a42298dddd28724bbaede765df54e563ede77f9f.tar.gz kolla-a42298dddd28724bbaede765df54e563ede77f9f.zip | |
Merge "Switch Fedora base image to fedora:21" into stable/kilo
| -rw-r--r-- | docker/fedora-rdo-base/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/hautoproxy/Dockerfile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile index f41cac97e..5dff0dfdf 100644 --- a/docker/fedora-rdo-base/Dockerfile +++ b/docker/fedora-rdo-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/hautoproxy/Dockerfile b/docker/hautoproxy/Dockerfile index 82b31eca3..c5c265d0a 100644 --- a/docker/hautoproxy/Dockerfile +++ b/docker/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 |