summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-15 15:00:06 +0000
committerGerrit Code Review <review@openstack.org>2015-10-15 15:00:06 +0000
commit045ee04a1e36a5bcdd0b4606ddf02e07bfdffc56 (patch)
tree50406d41270863181779983c2c9e5833bc1022df /docker
parent57cd336432025375c5127a02436d86d32ddbde22 (diff)
parent7c582b4bbf5f85135a1e33d7a26d2a169ecf759b (diff)
downloadkolla-045ee04a1e36a5bcdd0b4606ddf02e07bfdffc56.tar.gz
kolla-045ee04a1e36a5bcdd0b4606ddf02e07bfdffc56.zip
Merge "Use openstack/requirements for glance"
Diffstat (limited to 'docker')
-rw-r--r--docker/glance/glance-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index 3ca7e5133..5ce5397bc 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -37,7 +37,7 @@ RUN apt-get install -y --no-install-recommends \
ADD glance-base-archive /glance-base-source
RUN ln -s glance-base-source/* glance \
&& useradd --user-group glance \
- && pip --no-cache-dir install /glance \
+ && pip --no-cache-dir install -c requirements/upper-constraints.txt /glance \
&& mkdir -p /etc/glance /var/log/glance /home/glance \
&& cp -r /glance/etc/* /etc/glance/ \
&& chown -R glance: /etc/glance /var/log/glance /home/glance