aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-12 16:29:41 +0000
committerGerrit Code Review <review@openstack.org>2015-08-12 16:29:41 +0000
commit51575ddf849b10db91d81bfff7d26a4177fdfa7a (patch)
tree7b13f4adb0945da29a4305ca8a4245c8b8693a18 /docker
parent2ddfb1360144f8f002b3300004914a7540efa867 (diff)
parent40b56b086dc42c6424d7e6feac524c180fd66c2f (diff)
downloadkolla-51575ddf849b10db91d81bfff7d26a4177fdfa7a.tar.gz
kolla-51575ddf849b10db91d81bfff7d26a4177fdfa7a.zip
Merge "Remove tox -egenconfig since its not needed for cinder"
Diffstat (limited to 'docker')
-rw-r--r--docker/centos/source/cinder-app/cinder-base/Dockerfile2
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/centos/source/cinder-app/cinder-base/Dockerfile b/docker/centos/source/cinder-app/cinder-base/Dockerfile
index dd6d8a5bf..f07058bb9 100644
--- a/docker/centos/source/cinder-app/cinder-base/Dockerfile
+++ b/docker/centos/source/cinder-app/cinder-base/Dockerfile
@@ -8,9 +8,7 @@ RUN cd /cinder \
&& useradd --user-group cinder \
&& pip install -r requirements.txt \
&& pip install /cinder \
- && tox -egenconfig \
&& mkdir /etc/cinder /var/log/cinder \
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
- && cp /etc/cinder/cinder.conf.sample /etc/cinder/cinder.conf \
&& chown -R cinder: /etc/cinder /var/log/cinder \
&& rm -rf /root/.cache