From 961224c6cf5ac24fc49fc52ab3c51a87348ee35d Mon Sep 17 00:00:00 2001 From: Chao Guo Date: Tue, 17 Jan 2017 16:49:13 +0800 Subject: 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 Change-Id: If09582039f690fa4136e8f33200d5da15e092da7 --- docker/bifrost/bifrost-base/Dockerfile.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/bifrost') diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 796b06318..1d7c69d8b 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 -- cgit v1.2.3