diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-20 18:22:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-20 18:22:41 +0000 |
| commit | 213a585ee62fa0d349775303419775bc02eb34d9 (patch) | |
| tree | 71f70b10d28ea378cee5bed65ef447c1e5a35f18 /docker/openstack-base/Dockerfile.j2 | |
| parent | b39a80db9caea1f65bf1b69ebc68d7188410df66 (diff) | |
| parent | 961224c6cf5ac24fc49fc52ab3c51a87348ee35d (diff) | |
| download | kolla-213a585ee62fa0d349775303419775bc02eb34d9.tar.gz kolla-213a585ee62fa0d349775303419775bc02eb34d9.zip | |
Merge "Use install-pip macro in most source images"
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 8e3977583..c43b53fd8 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -350,11 +350,13 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ - && pip --no-cache-dir install -U virtualenv \ + && {{ macros.install_pip(['virtualenv'], constraints = false)}} \ && virtualenv --system-site-packages /var/lib/kolla/venv -{{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} + ENV PATH /var/lib/kolla/venv/bin:$PATH +RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} + {% endif %} {% block openstack_base_footer %}{% endblock %} |