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/base | |
| 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/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 89e0ac874..54730bd87 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -337,11 +337,13 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ ] %} {% if distro_python_version.startswith('3') %} {% set base_centos_binary_packages = base_centos_binary_packages + [ - 'python3' + 'python3', + 'python3-pip' ] %} {% else %} {% set base_centos_binary_packages = base_centos_binary_packages + [ - 'python' + 'python', + 'python-pip' ] %} {% endif %} {% if distro_package_manager == 'dnf' %} @@ -376,11 +378,13 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ ] %} {% if distro_python_version.startswith('3') %} {% set base_centos_source_packages = base_centos_source_packages + [ - 'python3' + 'python3', + 'python3-pip' ] %} {% else %} {% set base_centos_source_packages = base_centos_source_packages + [ - 'python' + 'python', + 'python-pip' ] %} {% endif %} {% if distro_package_manager == 'dnf' %} @@ -455,6 +459,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'open-iscsi', 'procps', 'python3', + 'python3-pip', 'socat', 'sudo', 'tgt'] |