diff options
| author | Martin André <m.andre@redhat.com> | 2016-02-23 12:01:59 +0900 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2016-02-23 12:15:14 +0900 |
| commit | ded2967ea6ed1f59f334bfdb81f99f820f9f773c (patch) | |
| tree | cf6c5bd7268110c9d4331f9a234256c4aaddf683 /docker | |
| parent | 937c771ec8cb0afdcae2b0b499b7f93f669d4221 (diff) | |
| download | kolla-ded2967ea6ed1f59f334bfdb81f99f820f9f773c.tar.gz kolla-ded2967ea6ed1f59f334bfdb81f99f820f9f773c.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-base/Dockerfile.j2 | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 031f8d824..885565222 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 f0f0f76c3..d6702a39f 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 \ |