From a11815cd96d5f55c14e5f58e67d0de14d3eb8a8b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 16 Sep 2021 16:28:00 +0200 Subject: Do not use distro_python_version for interpreter We can just use python3 - not longer need to tell which exactly like it was in py2/py3 times. Change-Id: Ib02f13cd2ad0037228e8975bd3fc37f41f23846f --- docker/macros.j2 | 2 +- docker/storm/storm-base/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/macros.j2 b/docker/macros.j2 index 0af1b6f14..61e3edce1 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -34,7 +34,7 @@ {% macro install_pip(packages, constraints = true) %} {%- if packages is sequence and packages|length > 0 -%} - python{{ distro_python_version }} -m pip --no-cache-dir install --upgrade{{ ' ' }} + python3 -m pip --no-cache-dir install --upgrade{{ ' ' }} {%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%} {{ packages | join(' ') }} {%- else -%} diff --git a/docker/storm/storm-base/Dockerfile.j2 b/docker/storm/storm-base/Dockerfile.j2 index 25151029d..66c279484 100644 --- a/docker/storm/storm-base/Dockerfile.j2 +++ b/docker/storm/storm-base/Dockerfile.j2 @@ -44,7 +44,7 @@ RUN curl -o /tmp/storm.tgz ${storm_url} \ {% block storm_python_version %} # NOTE(dszumski): Storm needs to be told where the Py3 interpreter lives -ENV PYTHON={{ '/usr/bin/python' ~ distro_python_version }} +ENV PYTHON='/usr/bin/python3' {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -- cgit v1.2.3