diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-26 11:55:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-26 11:55:00 +0000 |
| commit | f6c4fc69d93754843709f045d0bf9ebf6c416cba (patch) | |
| tree | 75e29acd476246fe6e5a033658b2cfcc088e1721 /docker/base | |
| parent | 50265b3c7d2868ad57bb007951fd04d2ec09f16a (diff) | |
| parent | 278893ef1d9bc8f7d013685d0676ce2458fcaaaa (diff) | |
| download | kolla-f6c4fc69d93754843709f045d0bf9ebf6c416cba.tar.gz kolla-f6c4fc69d93754843709f045d0bf9ebf6c416cba.zip | |
Merge "Improve pip install process for offline deployment." into stable/train
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 d2f21a99e..512024240 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'] |