diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-17 22:20:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-17 22:20:35 +0000 |
| commit | bfcbdc41f8e97c7b1c051b3887ede4bde3e65c5d (patch) | |
| tree | d62fb0fa465a37cf69213a830824b378eb5756ff | |
| parent | 86b778c27f6b2ff92bad47d81fb03da6944837f9 (diff) | |
| parent | 1d0b8afa8beef9b99509e0ec14878c665097a640 (diff) | |
| download | kolla-bfcbdc41f8e97c7b1c051b3887ede4bde3e65c5d.tar.gz kolla-bfcbdc41f8e97c7b1c051b3887ede4bde3e65c5d.zip | |
Merge "Use pip upper-constraints in magnum-base"
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index de0dab422..06cad1d5b 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -21,7 +21,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ ADD magnum-base-archive /magnum-base-source RUN ln -s magnum-base-source/* magnum \ && useradd --user-group magnum \ - && pip --no-cache-dir install /magnum \ + && pip --no-cache-dir install -c requirements/upper-constraints.txt /magnum \ && mkdir -p /etc/magnum /var/log/magnum /home/magnum \ && cp -r /magnum/etc/* /etc/magnum/ \ && chown -R magnum: /etc/magnum /var/log/magnum /home/magnum |