diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-29 11:55:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-29 11:55:19 +0000 |
| commit | 7bec0316a8367aca0af54674f574b5d4f9c2721f (patch) | |
| tree | 85d7e44eb97d5942094ccc4e7bafc653764b9704 /docker/openstack-base | |
| parent | 1439f839d42882c80ce81a1061dc52256df69fba (diff) | |
| parent | 3c618a1f6f0beca723e031fbe323b159400ad08f (diff) | |
| download | kolla-7bec0316a8367aca0af54674f574b5d4f9c2721f.tar.gz kolla-7bec0316a8367aca0af54674f574b5d4f9c2721f.zip | |
Merge "CentOS 8: base and openstack-base images"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 691e1864b..7b276bdc3 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -95,7 +95,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-vitrageclient', 'python3-webob', 'python3-zaqarclient', - 'util-linux-user' ] %} {% else %} {% set openstack_base_packages = openstack_base_packages + [ @@ -241,10 +240,18 @@ ENV DEBIAN_FRONTEND noninteractive 'openssl-devel', 'postgresql', 'postgresql-devel', - 'python-devel', 'sqlite-devel', 'zip' ] %} + {% if distro_python_version.startswith('3') %} + {% set openstack_base_packages = openstack_base_packages + [ + 'python3-devel', + ] %} + {% else %} + {% set openstack_base_packages = openstack_base_packages + [ + 'python-devel', + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set openstack_base_packages = [ |