diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-21 07:48:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-21 07:48:35 +0000 |
| commit | 1b9cedd8109a88707b55f633254b4110c3b3dd40 (patch) | |
| tree | 2487987e069669ffe04717bbd59ab74a78fee5bf /docker | |
| parent | e998831b9bbcb808effb0c92be5568cbcaf6142f (diff) | |
| parent | a11815cd96d5f55c14e5f58e67d0de14d3eb8a8b (diff) | |
| download | kolla-1b9cedd8109a88707b55f633254b4110c3b3dd40.tar.gz kolla-1b9cedd8109a88707b55f633254b4110c3b3dd40.zip | |
Merge "Do not use distro_python_version for interpreter"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/macros.j2 | 2 | ||||
| -rw-r--r-- | 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 |