diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-06-19 17:12:43 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-06-19 19:28:12 +0000 |
| commit | 0a6cd606c68281b6ef8301ab7a8e954440a6714a (patch) | |
| tree | e87260b713eda4573bac2cc1e5bcc7615cd0009a | |
| parent | 381637bbaca5b00e369e50558f90c1fcd4f77114 (diff) | |
| download | kolla-0a6cd606c68281b6ef8301ab7a8e954440a6714a.tar.gz kolla-0a6cd606c68281b6ef8301ab7a8e954440a6714a.zip | |
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)
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
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 }} |