diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-18 15:52:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-18 15:52:14 +0000 |
| commit | 9a8a8aa1b33f02a833ca1768adc1810948b32209 (patch) | |
| tree | 378e0a946b962ebb3020cb3078dd759339d02935 /docker | |
| parent | ac86cb997bd5831295f8c5034833bedc81ed6397 (diff) | |
| parent | ca16f7ae7da77102db2c1d533c401094479fe1ae (diff) | |
| download | kolla-9a8a8aa1b33f02a833ca1768adc1810948b32209.tar.gz kolla-9a8a8aa1b33f02a833ca1768adc1810948b32209.zip | |
Merge "docker: use python3-venv to create virtual env"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index b3d147458..073cc8f02 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -48,13 +48,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libxslt1-dev', 'openvswitch-switch', 'python3-dev', + 'python3-venv', 'rabbitmq-server', ] %} {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} {% set kolla_toolbox_pip_virtualenv_packages = [ - 'virtualenv' ] %} {% block kolla_toolbox_upper_constraints %} @@ -62,7 +62,7 @@ RUN mkdir -p /requirements \ && curl -o /requirements/upper-constraints.txt ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/{{ openstack_release }}} \ && sed -e "/^openstacksdk/d" -i /requirements/upper-constraints.txt \ && {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \ - && virtualenv --system-site-packages {{ virtualenv_path }} + && python3 -m venv --system-site-packages {{ virtualenv_path }} {% endblock %} ENV PATH {{ virtualenv_path }}/bin:$PATH diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index a89978950..f157d8ff7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -50,6 +50,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libz-dev', 'pkg-config', 'python3-dev', + 'python3-venv', 'zip' ] %} @@ -191,8 +192,7 @@ RUN ln -s openstack-base-source/* /requirements \ #} && sed -i /^ovs=/d /requirements/upper-constraints.txt \ && mkdir -p /var/lib/kolla \ - && {{ macros.install_pip(['virtualenv'])}} \ - && virtualenv --system-site-packages /var/lib/kolla/venv + && python3 -m venv --system-site-packages /var/lib/kolla/venv ENV PATH /var/lib/kolla/venv/bin:$PATH |