diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-26 15:36:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-26 15:36:57 +0000 |
| commit | 2def0be9a3c75e11a6cf99431bf917c54a11d9f3 (patch) | |
| tree | fc565fc270d04d9b9e87d4951f8bf6061e50f5ac /docker/openstack-base | |
| parent | 630c181712f8f24da834f385935eb9f3d8685891 (diff) | |
| parent | 4b35eb5e241147fb38cf81a11ba63b6ac7c77f90 (diff) | |
| download | kolla-2def0be9a3c75e11a6cf99431bf917c54a11d9f3.tar.gz kolla-2def0be9a3c75e11a6cf99431bf917c54a11d9f3.zip | |
Merge "CentOS 8: base and openstack-base images" into stable/train
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 = [ |