diff options
| author | Zuul <zuul@review.opendev.org> | 2024-12-19 09:01:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-12-19 09:01:02 +0000 |
| commit | 3cb7bea93be35bef0f4a93cc874cbc422d4fe084 (patch) | |
| tree | 7da2eda377502d79c83b1c5e0998ae14c6c36bf0 | |
| parent | b1be32617803e2a6c24f449a37622717e2a6d102 (diff) | |
| parent | 1df09532d797a3b722185aef6444e53c2676bac9 (diff) | |
| download | kolla-3cb7bea93be35bef0f4a93cc874cbc422d4fe084.tar.gz kolla-3cb7bea93be35bef0f4a93cc874cbc422d4fe084.zip | |
Merge "Move uwsgi installation to openstack-base"
| -rw-r--r-- | docker/barbican/barbican-base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | releasenotes/notes/uwsgi-openstack-base-ac583652d29ea0e4.yaml | 5 |
3 files changed, 8 insertions, 7 deletions
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' ] diff --git a/releasenotes/notes/uwsgi-openstack-base-ac583652d29ea0e4.yaml b/releasenotes/notes/uwsgi-openstack-base-ac583652d29ea0e4.yaml new file mode 100644 index 000000000..ab2811bfc --- /dev/null +++ b/releasenotes/notes/uwsgi-openstack-base-ac583652d29ea0e4.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + ``uwsgi`` and ``uwsgi-plugin-python3`` installation has been moved from + ``barbican-base`` image to ``openstack-base``. |