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/nova | |
| 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/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 13109388e..9c3014ce0 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -57,8 +57,13 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(nova_base_packages | customizable("packages")) }} ADD nova-base-archive /nova-base-source + +{% set nova_base_pip_packages = [ + '/nova' +] %} + RUN ln -s nova-base-source/* nova \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /nova \ + && {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/nova/ \ && cp -r /nova/etc/nova/* /etc/nova/ \ && chown -R nova: /etc/nova/ \ diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 0304c7954..925f6ba36 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -84,7 +84,7 @@ RUN mkdir -p /etc/ceph ] %} -{{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }} +RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }} {% endif %} |