diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-05 12:21:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-05 12:21:31 +0000 |
| commit | 1d3e161b8775a7bb44260f2161f6515cf6d940ed (patch) | |
| tree | 5dfa66ea3cb83634a7b5edd7a35b5a890c392fbf /docker | |
| parent | a71b5d4403e961c072832d9ff7334c2ddfc7861b (diff) | |
| parent | 92f4e5a04fed74bf5aed607a3d21dd912469c267 (diff) | |
| download | kolla-1d3e161b8775a7bb44260f2161f6515cf6d940ed.tar.gz kolla-1d3e161b8775a7bb44260f2161f6515cf6d940ed.zip | |
Merge "Remove MariaDB-shared in openstack-base"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3d38e6853..d81e49006 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -2,12 +2,10 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} -# TODO(mandre) remove MariaDB-shared once Percona has fixed its packaging issue RUN yum -y install \ git \ iproute \ mariadb-libs \ - MariaDB-shared \ openssl \ && yum clean all |