diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-15 14:58:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-15 14:58:36 +0000 |
| commit | 74874de6ecf52a258a39aa12d52a60a7781a2265 (patch) | |
| tree | 7467c2c5afc2166183d6afca38c8176a6fd1fa9c /docker | |
| parent | 2f1cc59b56ec99c7fa21160823b4d6eb1b14d1ed (diff) | |
| parent | be8a3661843e855c2fc4d160782bc0d8782a8a6b (diff) | |
| download | kolla-74874de6ecf52a258a39aa12d52a60a7781a2265.tar.gz kolla-74874de6ecf52a258a39aa12d52a60a7781a2265.zip | |
Merge "Use openstack/requirements for keystone"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index bbea133d4..58975902c 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -38,7 +38,7 @@ RUN apt-get install -y --no-install-recommends \ ADD keystone-archive /keystone-source RUN ln -s keystone-source/* keystone \ && useradd --user-group keystone \ - && pip --no-cache-dir install /keystone \ + && pip --no-cache-dir install -c requirements/upper-constraints.txt /keystone \ && mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \ && cp -r /keystone/etc/* /etc/keystone/ \ && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/admin \ |