From edf0468c620b8a05e87d733171be9c84bfdb6c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Wed, 6 Jan 2016 12:34:11 +0900 Subject: [PATCH] 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 --- docker/trove/trove-base/Dockerfile.j2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index f0ae9ff888..cd32f19610 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 \