diff options
| author | Martin André <m.andre@redhat.com> | 2016-01-06 12:34:11 +0900 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2016-01-06 14:36:50 +0900 |
| commit | edf0468c620b8a05e87d733171be9c84bfdb6c09 (patch) | |
| tree | 56aaac2b96c28e8418ee16d47f07fe3ea47fce94 /docker/trove | |
| parent | eda2b56e3c20590e9fd669ea63d3b9f88c3cad2c (diff) | |
| download | kolla-edf0468c620b8a05e87d733171be9c84bfdb6c09.tar.gz kolla-edf0468c620b8a05e87d733171be9c84bfdb6c09.zip | |
Fix centos-source trove image building
It appears Trove still depends on MySQL-python.
Restore the workaround for broken Percona repo.
Closes-Bug: #1531371
Related-Bug: #1526129
Change-Id: I1781fee14e17a6b7cbb2cf8dae639e049698b9e6
Diffstat (limited to 'docker/trove')
| -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 \ |