diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-06 10:54:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-06 10:54:54 +0000 |
| commit | e7c3677e5aba1ce7b1d69af2d6367fda98b3d21a (patch) | |
| tree | a1262af3002259b1c43c416d9093d62d4ea78d9f /docker | |
| parent | fdb440b7f67e45caee99dce7bcbe172217f4e062 (diff) | |
| parent | edf0468c620b8a05e87d733171be9c84bfdb6c09 (diff) | |
| download | kolla-e7c3677e5aba1ce7b1d69af2d6367fda98b3d21a.tar.gz kolla-e7c3677e5aba1ce7b1d69af2d6367fda98b3d21a.zip | |
Merge "Fix centos-source trove image building"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/trove/trove-base/Dockerfile.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index f0ae9ff88..cd32f1961 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -11,6 +11,15 @@ RUN yum -y install \ {% endif %} {% 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 RUN ln -s trove-base-source/* trove \ |