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/watcher/watcher-base/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/watcher') diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 5f8c66ec9..31a0839e4 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -18,8 +18,13 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} ADD watcher-base-archive /watcher-base-source + +{% set watcher_base_pip_packages = [ + '/watcher' +] %} + RUN ln -s watcher-base-source/* watcher \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /watcher \ + && {{ macros.install_pip(watcher_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/watcher \ && cp -r /watcher/etc/watcher/* /etc/watcher/ \ && chown -R watcher: /etc/watcher -- cgit v1.2.3