aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-15 14:59:22 +0000
committerGerrit Code Review <review@openstack.org>2015-10-15 14:59:22 +0000
commit180de5f376581aa0e040961de725b93664f80b36 (patch)
tree2b0d4e3046c7e04ddf2d9b5133e762ef5ea5a606 /docker
parent1257e50aac1495a74f41a12f761755dabbf2947a (diff)
parent9f39f2725e3892553c78bfd292fbcbfde86b29ee (diff)
downloadkolla-180de5f376581aa0e040961de725b93664f80b36.tar.gz
kolla-180de5f376581aa0e040961de725b93664f80b36.zip
Merge "Use openstack/requirements for cinder"
Diffstat (limited to 'docker')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 214810ef1..3741578f6 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -36,7 +36,7 @@ RUN apt-get install -y --no-install-recommends \
ADD cinder-base-archive /cinder-base-source
RUN ln -s cinder-base-source/* cinder \
&& useradd --user-group cinder \
- && pip --no-cache-dir install /cinder \
+ && pip --no-cache-dir install -c requirements/upper-constraints.txt /cinder \
&& mkdir -p /etc/cinder /var/log/cinder /home/cinder \
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
&& chown -R cinder: /etc/cinder /var/log/cinder /home/cinder \