aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-04-18 15:52:14 +0000
committerGerrit Code Review <review@openstack.org>2023-04-18 15:52:14 +0000
commit9a8a8aa1b33f02a833ca1768adc1810948b32209 (patch)
tree378e0a946b962ebb3020cb3078dd759339d02935 /docker/kolla-toolbox
parentac86cb997bd5831295f8c5034833bedc81ed6397 (diff)
parentca16f7ae7da77102db2c1d533c401094479fe1ae (diff)
downloadkolla-9a8a8aa1b33f02a833ca1768adc1810948b32209.tar.gz
kolla-9a8a8aa1b33f02a833ca1768adc1810948b32209.zip
Merge "docker: use python3-venv to create virtual env"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j24
1 files changed, 2 insertions, 2 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