diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:06 +0000 |
| commit | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (patch) | |
| tree | 2b991061d4292373b31cb1c0a70479629c9fd9f3 /docker/openstack-base | |
| parent | e9289eaa1ca59a59c6eda79197794f42fd2d4bfc (diff) | |
| parent | d436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (diff) | |
| download | kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.tar.gz kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.zip | |
Merge "Debian/Ubuntu: move to Python 3 for source images"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index edc07e73d..03c64fc7d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -256,7 +256,7 @@ ENV DEBIAN_FRONTEND noninteractive 'libyaml-dev', 'libz-dev', 'pkg-config', - 'python-dev', + 'python3-dev', 'zip' ] %} @@ -295,7 +295,6 @@ ENV DEBIAN_FRONTEND noninteractive 'eventlet', 'fasteners', 'funcsigs', - 'futures', 'futurist', 'gnocchiclient', 'greenlet', @@ -379,7 +378,8 @@ ENV DEBIAN_FRONTEND noninteractive {% if distro_python_version == '2.7' %} {% set openstack_base_pip_packages = openstack_base_pip_packages + [ 'enum34', - 'functools32' + 'functools32', + 'futures' ] %} {% endif %} |