diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-06-05 17:16:49 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-06-06 11:06:58 +0000 |
| commit | aa59f0db6f88ed0a03169b473fdf6d541d34df9f (patch) | |
| tree | d5d2bc3512d17f88a052f652a7d0d073f61fe47c /docker/panko | |
| parent | 4e083196d14877de458ae16129331c37fe1f6f21 (diff) | |
| download | kolla-aa59f0db6f88ed0a03169b473fdf6d541d34df9f.tar.gz kolla-aa59f0db6f88ed0a03169b473fdf6d541d34df9f.zip | |
Debian/Ubuntu: more python3 packages for binary
backport: Stein
During the switch to Stein UCA, we did not switch all packages to python
3 for Debian/Ubuntu binary images. This change switches some more of
those packages.
Change-Id: I0bff21384d88ea678608392de2db1ba418c96665
Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'docker/panko')
| -rw-r--r-- | docker/panko/panko-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index ca0db74ee..394ddc8aa 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -23,7 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set panko_api_packages = [ 'panko-api', - 'python-pymongo' + 'python3-pymongo' ] %} {% endif %} diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 8111c616c..d8fae6ab7 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -33,7 +33,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set panko_base_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(panko_base_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf |