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/bifrost | |
| 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/bifrost')
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 2ab693e01..4b2854e12 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -15,10 +15,14 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/fa ENV VENV /var/lib/kolla/venv +{% set bifrost_base_pip_packages = [ + '/bifrost' +] %} + ADD bifrost-base-archive /bifrost-base-source COPY build_arg.yml /tmp/build_arg.yml RUN ln -s bifrost-base-source/* bifrost \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /bifrost + && {{ macros.install_pip(bifrost_base_pip_packages | customizable("pip_packages")) }} WORKDIR /bifrost |