diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 05:37:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 05:37:07 +0000 |
| commit | 33fd50e603d48de4f1f2fc25ba649561efc25cac (patch) | |
| tree | d6269225b7b994227dcd9afd0d55ff0d8d6af271 /docker | |
| parent | eb3e99399bf36f1aa22cf2b64f935327bf79d0c1 (diff) | |
| parent | 937c771ec8cb0afdcae2b0b499b7f93f669d4221 (diff) | |
| download | kolla-33fd50e603d48de4f1f2fc25ba649561efc25cac.tar.gz kolla-33fd50e603d48de4f1f2fc25ba649561efc25cac.zip | |
Merge "Fix building centos kolla-toolbox"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 1c6cebb2b..031f8d824 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -11,7 +11,6 @@ RUN yum -y install \ libxml2-devel \ libxslt-devel \ mariadb-devel \ - mariadb-libs \ MariaDB-shared \ openssl-devel \ python-devel \ diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index d1a91d736..60e72a5cc 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -5,7 +5,6 @@ MAINTAINER {{ maintainer }} RUN yum -y install \ git \ iproute \ - mariadb-libs \ openssl \ && yum clean all |