openstack/kolla
Code Issues Proposed changes

Merge "docker: use python3-venv to create virtual env"

Browse Source
This commit is contained in:
Zuul 2023-04-18 15:52:14 +00:00 committed by Gerrit Code Review
commit 9a8a8aa1b3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/kolla-toolbox/Dockerfile.j2
View File

@ -48,13 +48,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libxslt1-dev', 'libxslt1-dev',
'openvswitch-switch', 'openvswitch-switch',
'python3-dev', 'python3-dev',
'python3-venv',
'rabbitmq-server', 'rabbitmq-server',
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
{% set kolla_toolbox_pip_virtualenv_packages = [ {% set kolla_toolbox_pip_virtualenv_packages = [
'virtualenv'
] %} ] %}
{% block kolla_toolbox_upper_constraints %} {% 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 }}} \ && 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 \ && sed -e "/^openstacksdk/d" -i /requirements/upper-constraints.txt \
&& {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \ && {{ 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 %} {% endblock %}
ENV PATH {{ virtualenv_path }}/bin:$PATH ENV PATH {{ virtualenv_path }}/bin:$PATH

4
docker/openstack-base/Dockerfile.j2
View File

@ -50,6 +50,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libz-dev', 'libz-dev',
'pkg-config', 'pkg-config',
'python3-dev', 'python3-dev',
'python3-venv',
'zip' 'zip'
] %} ] %}
@ -191,8 +192,7 @@ RUN ln -s openstack-base-source/* /requirements \
#} #}
&& sed -i /^ovs=/d /requirements/upper-constraints.txt \ && sed -i /^ovs=/d /requirements/upper-constraints.txt \
&& mkdir -p /var/lib/kolla \ && mkdir -p /var/lib/kolla \
&& {{ macros.install_pip(['virtualenv'])}} \ && python3 -m venv --system-site-packages /var/lib/kolla/venv
&& virtualenv --system-site-packages /var/lib/kolla/venv
ENV PATH /var/lib/kolla/venv/bin:$PATH ENV PATH /var/lib/kolla/venv/bin:$PATH