From 1df09532d797a3b722185aef6444e53c2676bac9 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 21 Nov 2024 20:34:31 +0100 Subject: Move uwsgi installation to openstack-base Change-Id: I581ff79993d011b421d69295a6552cb14b8e2e66 --- docker/barbican/barbican-base/Dockerfile.j2 | 7 ------- docker/openstack-base/Dockerfile.j2 | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 6632433cc..057cfe08e 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -9,19 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='barbican', groups='nfast') }} -{% if base_package_type == 'rpm' %} - {% set barbican_base_packages = ['uwsgi-plugin-python3'] %} -{% elif base_package_type == 'deb' %} - {% set barbican_base_packages = ['uwsgi-plugin-python3'] %} -{% endif %} - {{ macros.install_packages(barbican_base_packages | customizable("packages")) }} {% set barbican_base_pip_packages = [ '/barbican', 'pastedeploy', 'python-barbicanclient', - 'uwsgi' ] %} ADD barbican-base-archive /barbican-base-source diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 46af0aecd..9b04ea89b 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -30,6 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-devel', 'python3-mod_wsgi', 'sqlite-devel', + 'uwsgi-plugin-python3', 'zip' ] %} @@ -51,6 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'pkg-config', 'python3-dev', 'python3-venv', + 'uwsgi-plugin-python3', 'zip' ] %} @@ -175,6 +177,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'stevedore', 'tooz[consul,etcd,etcd3gw,zake,redis,postgresql,mysql,zookeeper,memcached,ipc]', 'unicodecsv', + 'uwsgi', 'warlock', 'wrapt' ] -- cgit v1.2.3