diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-23 10:01:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-23 10:01:57 +0000 |
| commit | 46b82a2a77e9749e370a27edf2d48b5f3cc417a1 (patch) | |
| tree | 0c18d551dd724ce931be372506c5c93a670dd57e /docker/openstack-base | |
| parent | a7135c9e15b4ec919f971afa0821752c692d6247 (diff) | |
| parent | 1cda1acc7fd22bc42917c723f14c6ee076098297 (diff) | |
| download | kolla-46b82a2a77e9749e370a27edf2d48b5f3cc417a1.tar.gz kolla-46b82a2a77e9749e370a27edf2d48b5f3cc417a1.zip | |
Merge "Switch to Dynamic Python Version Detection"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 1df4321e5..f6aebd6ca 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -195,7 +195,9 @@ RUN ln -s openstack-base-source/* /requirements \ #} && {{ macros.upper_constraints_remove("ovs") }} \ && mkdir -p /var/lib/kolla \ - && python3 -m venv --system-site-packages /var/lib/kolla/venv + && python3 -m venv --system-site-packages /var/lib/kolla/venv \ + && KOLLA_DISTRO_PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))") \ + && ln -s python${KOLLA_DISTRO_PYTHON_VERSION} /var/lib/kolla/venv/lib/python3 {# Block used for overriding global version constraints. |