diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-28 14:30:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-28 14:30:40 +0000 |
| commit | 2f615ebad819c2a63dccac3efe6787a90494a584 (patch) | |
| tree | 0c9771308cd2059754190341fdfe945a03db250b /docker | |
| parent | 544894731ce5b4cceb6de9bf169520c581a6b41b (diff) | |
| parent | 8583243e893cc559480d706285fbeaaffed05faa (diff) | |
| download | kolla-2f615ebad819c2a63dccac3efe6787a90494a584.tar.gz kolla-2f615ebad819c2a63dccac3efe6787a90494a584.zip | |
Merge "CentOS 8: Install python in the base image (Train only)" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
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', |