diff options
| author | Chao Guo <guochao@winhong.com> | 2017-01-17 16:49:13 +0800 |
|---|---|---|
| committer | Mauricio Lima <mauriciolimab@gmail.com> | 2017-02-17 08:49:32 -0300 |
| commit | 961224c6cf5ac24fc49fc52ab3c51a87348ee35d (patch) | |
| tree | 23301c12bfd158395e089b7563f0c7058cd2fb6e /docker/openstack-base | |
| parent | dab3b8e8b95cd09f7cc0f99e853cc84b0e1f2638 (diff) | |
| download | kolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.tar.gz kolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.zip | |
Use install-pip macro in most source images
1. Enable customization of pip packages in source
branch of most images
2. All pip packages install uniformly through
install-pip macro, user can easily customize his
own pip command (For example using a mirror)
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
Diffstat (limited to 'docker/openstack-base')
| -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 %} |