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/dind/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/dind') diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index da3ae5e7c..4daa70e32 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -19,7 +19,12 @@ RUN /bin/true 'openssh-server' ] %} {{ macros.install_packages(dind_packages | customizable("packages")) }} -RUN pip --no-cache-dir install --upgrade docker-py + +{% set dind_pip_packages = [ + 'docker-py' +] %} + +RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }} {% endif %} -- cgit v1.2.3