diff options
| author | Gaël THEROND (Fl1nt) <gael.therond@bitswalk.com> | 2020-09-17 14:38:21 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-01-24 16:58:13 +0100 |
| commit | 278893ef1d9bc8f7d013685d0676ce2458fcaaaa (patch) | |
| tree | 73ef49126ce905bb42e32b4128d09b0077c88662 /docker/gnocchi | |
| parent | 6beff0cfc92f3df0ff7210d8388506a1f961a5c3 (diff) | |
| download | kolla-278893ef1d9bc8f7d013685d0676ce2458fcaaaa.tar.gz kolla-278893ef1d9bc8f7d013685d0676ce2458fcaaaa.zip | |
Improve pip install process for offline deployment.
* "Use distribution-provided pip"
* "Use python's pip module invocation method"
* "Install pip earlier in order to avoid multiple installation"
* "Remove pip_version variable requirement and call"
(cherry picked from commit b93c40a3635fbce72e48dc29120e50484cba36ca)
- fixed source type builds.
- in openstack-base: install virtualenv using upper-constraints
(just like in kolla-toolbox)
Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/772198
Closes-bug: #1893204
Change-Id: Id0e738044a1931f9d611a7281a48ea4a593f1cf1
Diffstat (limited to 'docker/gnocchi')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 442da59d9..59c77fcce 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -53,7 +53,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ ] %} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} -RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \ +RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false) }} \ && truncate -s 0 /etc/apache2/ports.conf {% endif %} |