openstack/kolla-ansible
Code Issues Proposed changes

Merge "Switch Fedora base image to fedora:21"

Browse Source
This commit is contained in:
Jenkins 2015-05-26 14:39:58 +00:00 committed by Gerrit Code Review
commit e832e35295
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/centos/binary/fedora-binary-base/Dockerfile
View File

@ -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 \

2
docker/centos/binary/hautoproxy/Dockerfile
View File

@ -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