aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <martin.andre@kvhasia.com>2014-12-30 14:25:04 +0900
committerMartin André <martin.andre@kvhasia.com>2015-05-26 10:56:02 +0900
commit17aed1ebb3679706982496658c045cb6e441e61d (patch)
tree29d1ce3644ab6cc3d31a19b8c9472b0f1d9c4426
parent9249ed0d1d6dc1ce3d61f5be0a0b3853619404b1 (diff)
downloadkolla-17aed1ebb3679706982496658c045cb6e441e61d.tar.gz
kolla-17aed1ebb3679706982496658c045cb6e441e61d.zip
Switch Fedora base image to fedora:21
Install required iproute package on fedora 21 for 'ip' command to work. Change-Id: Id98035dbe1eb5c0c76321784956ec15ac5d69068
-rw-r--r--docker/centos/binary/fedora-binary-base/Dockerfile3
-rw-r--r--docker/centos/binary/hautoproxy/Dockerfile2
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