summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-02-27 18:07:12 +0000
committerMark Goddard <mark@stackhpc.com>2020-02-28 09:19:26 +0000
commit8583243e893cc559480d706285fbeaaffed05faa (patch)
tree7533bce9066d3563bede20ffa2c14ddaa7fb6515 /docker
parentf367d2303f3fe22cdd9ce55b20dd77918676ab36 (diff)
downloadkolla-8583243e893cc559480d706285fbeaaffed05faa.tar.gz
kolla-8583243e893cc559480d706285fbeaaffed05faa.zip
CentOS 8: Install python in the base image (Train only)
This was missed due to the difference in base package lists between master and stable/train, with train having separate lists for binary and source, and master having a single combined list. Partially-Implements: blueprint centos-rhel-8 Change-Id: I4417ad735933df786651f3190cc3250b9b306027
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j29
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 651f29601..24158a5e4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -365,6 +365,15 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
'tar',
'which'
] %}
+{% if distro_python_version.startswith('3') %}
+{% set base_centos_source_packages = base_centos_source_packages + [
+ 'python3'
+] %}
+{% else %}
+{% set base_centos_source_packages = base_centos_source_packages + [
+ 'python'
+] %}
+{% endif %}
{% if distro_package_manager == 'dnf' %}
{% set base_centos_source_packages = base_centos_source_packages + [
'util-linux-user',