From ded2967ea6ed1f59f334bfdb81f99f820f9f773c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 23 Feb 2016 12:01:59 +0900 Subject: [PATCH] Remove unneeded deps Percona has fixed their packaging issue and now MySQL-python installs cleanly without the need of MariaDB-shared package. TrivialFix Change-Id: I42672c269185352ab4999683bd0ad7c5f23de3bb --- docker/kolla-toolbox/Dockerfile.j2 | 2 -- docker/trove/trove-base/Dockerfile.j2 | 9 --------- 2 files changed, 11 deletions(-) diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 031f8d824d..885565222a 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -3,7 +3,6 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -# TODO(mandre) remove MariaDB-shared once Percona has fixed its packaging issue RUN yum -y install \ gcc \ git \ @@ -11,7 +10,6 @@ RUN yum -y install \ libxml2-devel \ libxslt-devel \ mariadb-devel \ - MariaDB-shared \ openssl-devel \ python-devel \ openssh-clients \ diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index f0f0f76c30..d6702a39f4 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -17,15 +17,6 @@ RUN apt-get install -y --no-install-recommends \ {% 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 \