diff options
| author | Chao Guo <guochao@winhong.com> | 2017-01-17 16:49:13 +0800 |
|---|---|---|
| committer | Mauricio Lima <mauriciolimab@gmail.com> | 2017-02-17 08:49:32 -0300 |
| commit | 961224c6cf5ac24fc49fc52ab3c51a87348ee35d (patch) | |
| tree | 23301c12bfd158395e089b7563f0c7058cd2fb6e /docker/kolla-toolbox | |
| parent | dab3b8e8b95cd09f7cc0f99e853cc84b0e1f2638 (diff) | |
| download | kolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.tar.gz kolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.zip | |
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 <mauriciolimab@gmail.com>
Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 8f348cbfa..16e6f9dc3 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -56,13 +56,16 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && 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 +{% set kolla_toolbox_pip_packages = [ + 'pytz', + 'ansible==2.1.1.0', + 'MySQL-python', + 'os-client-config==1.16.0', + 'pyudev', + 'shade==1.5.0' + ] %} + +RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages"), constraints = false) }} RUN mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \ |