openstack
/
kolla
Code Issues Proposed changes

Fix building centos kolla-toolbox 

Percona recently updated their package which is now conflicting with
mariadb-libs.

Closes-Bug: #1548589

Change-Id: I9db7ffb8b94b623784cffa3e63804c47375097d1
This commit is contained in:
Jeffrey Zhang 2016-02-22 07:32:47 +08:00 committed by Martin André
parent 0e67afb73b
commit 937c771ec8
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/kolla-toolbox/Dockerfile.j2
View File

@ -11,7 +11,6 @@ RUN yum -y install \
libxml2-devel \
libxslt-devel \
mariadb-devel \
mariadb-libs \
MariaDB-shared \
openssl-devel \
python-devel \

1
docker/openstack-base/Dockerfile.j2
View File

@ -5,7 +5,6 @@ MAINTAINER {{ maintainer }}
RUN yum -y install \
git \
iproute \
mariadb-libs \
openssl \
&& yum clean all