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/tacker/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/tacker') diff --git a/docker/tacker/Dockerfile.j2 b/docker/tacker/Dockerfile.j2 index 4f094aa84..e77264a73 100644 --- a/docker/tacker/Dockerfile.j2 +++ b/docker/tacker/Dockerfile.j2 @@ -15,8 +15,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} ADD tacker-archive /tacker-source + +{% set tacker_pip_packages = [ + '/tacker' +] %} + RUN ln -s tacker-source/* tacker \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /tacker \ + && {{ macros.install_pip(tacker_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/tacker \ && cp -r /tacker/etc/tacker/* /etc/tacker \ && chown -R tacker: /etc/tacker -- cgit v1.2.3