From e2c43b206e0a2ad47505805f3dc8841adeb3bb51 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Thu, 20 Oct 2016 16:04:28 +0100 Subject: Allow operators to customise pip in kolla-toolbox Closes-Bug: #1635304 Change-Id: I6535e3240695458ed04c8750fe34e772a3b2ede3 --- docker/kolla-toolbox/Dockerfile.j2 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'docker') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 78b0a6cbd..cbb495ac3 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -48,16 +48,19 @@ MAINTAINER {{ maintainer }} {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} +{% block kolla_toolbox_source_install_python_pip %} RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ - && rm get-pip.py \ - && pip --no-cache-dir install pytz \ - && pip --no-cache-dir install \ - ansible==2.1.1.0 \ - MySQL-python \ - os-client-config==1.16.0 \ - pyudev \ - shade==1.5.0 + && rm get-pip.py +{% endblock %} + +RUN pip --no-cache-dir install \ + pytz \ + ansible==2.1.1.0 \ + MySQL-python \ + os-client-config==1.16.0 \ + pyudev \ + shade==1.5.0 RUN useradd -m --user-group ansible --groups kolla \ && mkdir -p /etc/ansible /usr/share/ansible \ -- cgit v1.2.3