openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix centos-source trove image building"

Browse Source
This commit is contained in:
Jenkins 2016-01-06 10:54:54 +00:00 committed by Gerrit Code Review
commit e7c3677e5a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/trove/trove-base/Dockerfile.j2
View File

@ -11,6 +11,15 @@ RUN yum -y install \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# TODO(mandre) remove MariaDB-shared once Percona has fixed its packaging issue
# https://groups.google.com/forum/#!topic/percona-discussion/8-k_FS40Cdk
RUN yum -y install \
MariaDB-shared \
&& yum clean all
{% endif %}
ADD trove-base-archive /trove-base-source ADD trove-base-archive /trove-base-source
RUN ln -s trove-base-source/* trove \ RUN ln -s trove-base-source/* trove \