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/cloudkitty | |
| 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/cloudkitty')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 18d017e23..c9976c80b 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -25,9 +25,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} +{% set cloudkitty_base_pip_packages = [ + '/cloudkitty' +] %} + ADD cloudkitty-base-archive /cloudkitty-base-source RUN ln -s cloudkitty-base-source/* cloudkitty \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /cloudkitty \ + && {{ macros.install_pip(cloudkitty_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/cloudkitty \ && cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \ && chown -R cloudkitty: /etc/cloudkitty |