diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 13:49:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 13:49:50 +0000 |
| commit | 32e2121b4f0f7a8bba52ce2995ee5e45bc6bd3c7 (patch) | |
| tree | 0a1eb2ebbdccbc6780a7e5fe0110664f8da0b047 /docker/kolla-toolbox | |
| parent | dbc881456bab8ed0f3fdb3acfcdd27962f78f1ca (diff) | |
| parent | e2c43b206e0a2ad47505805f3dc8841adeb3bb51 (diff) | |
| download | kolla-32e2121b4f0f7a8bba52ce2995ee5e45bc6bd3c7.tar.gz kolla-32e2121b4f0f7a8bba52ce2995ee5e45bc6bd3c7.zip | |
Merge "Allow operators to customise pip in kolla-toolbox"
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index a74024f8e..5b5dab888 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 \ |