From 278893ef1d9bc8f7d013685d0676ce2458fcaaaa Mon Sep 17 00:00:00 2001 From: "Gaël THEROND (Fl1nt)" Date: Thu, 17 Sep 2020 14:38:21 +0200 Subject: Improve pip install process for offline deployment. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * "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 Co-authored-by: Radosław Piliszek Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/772198 Closes-bug: #1893204 Change-Id: Id0e738044a1931f9d611a7281a48ea4a593f1cf1 --- docker/openstack-base/Dockerfile.j2 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'docker/openstack-base/Dockerfile.j2') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 30427bbe1..9ff44b86f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -276,10 +276,6 @@ ENV DEBIAN_FRONTEND noninteractive {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} -{% block source_install_python_pip %} -{{ macros.get_pip() }} -{% endblock %} - {% set openstack_base_pip_packages = [ 'Babel', 'Mako', @@ -409,7 +405,7 @@ ENV DEBIAN_FRONTEND noninteractive ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ - && {{ macros.install_pip(['virtualenv'], constraints = false)}} \ + && {{ macros.install_pip(['virtualenv'])}} \ && virtualenv --system-site-packages /var/lib/kolla/venv ENV PATH /var/lib/kolla/venv/bin:$PATH -- cgit v1.2.3