From 0a6cd606c68281b6ef8301ab7a8e954440a6714a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Jun 2020 17:12:43 +0200 Subject: kolla-toolbox: use u-c while installing virtualenv We need to be sure that we use exact same version every time. So fetch upper-constraints.txt file earlier and use it while installing virtualenv package. Change-Id: I61711a878b2bda9f0d2e88966f13121dfcddfda7 (cherry picked from commit 13f9303b96502dba9d8696909f7e27f44675574a) --- docker/kolla-toolbox/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index fbe4abc7c..980027e24 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -78,7 +78,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'virtualenv' ] %} -RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages"), constraints=false) }} \ +RUN mkdir -p /requirements \ + && curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \ + && {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \ && virtualenv --system-site-packages {{ virtualenv_path }} ENV PATH {{ virtualenv_path }}/bin:$PATH @@ -97,9 +99,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH 'shade' ] %} -RUN mkdir -p /requirements \ - && curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \ - && {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ +RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} -- cgit v1.2.3