Merge "Switch to Debian Trixie"

6 files changed, 9 insertions, 18 deletions

diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 5edb8814a..08e21ff22 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -1,4 +1,4 @@
 # NOTE(hrw): we do not want backports unless requested
 Package: *
-Pin: release n=bookworm-backports
+Pin: release n=trixie-backports
 Pin-Priority: -1000
diff --git a/docker/base/debian.sources b/docker/base/debian.sources
index 2b502a609..28c61c81d 100644
--- a/docker/base/debian.sources
+++ b/docker/base/debian.sources
@@ -1,13 +1,13 @@
 Types: deb
 # http://snapshot.debian.org/archive/debian/20251020T000000Z
 URIs: http://deb.debian.org/debian
-Suites: bookworm bookworm-updates bookworm-backports
+Suites: trixie trixie-updates trixie-backports
 Components: main
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 
 Types: deb
 # http://snapshot.debian.org/archive/debian-security/20251020T000000Z
 URIs: http://deb.debian.org/debian-security
-Suites: bookworm-security
+Suites: trixie-security
 Components: main
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2
index 2b58e7b12..a41465661 100644
--- a/docker/httpd/Dockerfile.j2
+++ b/docker/httpd/Dockerfile.j2
@@ -22,8 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'apache2',
         'ca-certificates',
         'libapache2-mod-auth-mellon',
-        'libapache2-mod-auth-openidc',
-        'libapache2-mod-proxy-uwsgi'
+        'libapache2-mod-auth-openidc'
     ] %}
 {% endif %}
 
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index fafd405d5..85b1f4b00 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'git',
         'libapache2-mod-wsgi-py3',
         'libffi-dev',
-        'libpcre3-dev',
+        'libpcre2-dev',
         'libpq-dev',
         'libssl-dev',
         'libxml2-dev',
diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/docker/valkey/valkey-sentinel/Dockerfile.j2
index e3045d2fe..9cdfac282 100644
--- a/docker/valkey/valkey-sentinel/Dockerfile.j2
+++ b/docker/valkey/valkey-sentinel/Dockerfile.j2
@@ -11,11 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['epel']) }}
     {% set valkey_sentinel_packages = ['valkey'] %}
 {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-        {% set valkey_sentinel_packages = ['valkey-sentinel/bookworm-backports'] %}
-    {% else %}
-        {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
-    {% endif %}
+    {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
 {% endif %}
 {{ macros.install_packages(valkey_sentinel_packages | customizable("packages")) }}
 
diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/docker/valkey/valkey-server/Dockerfile.j2
index 7b989f66b..9d187ffbe 100644
--- a/docker/valkey/valkey-server/Dockerfile.j2
+++ b/docker/valkey/valkey-server/Dockerfile.j2
@@ -9,14 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
 {{ macros.enable_extra_repos(['epel']) }}
-    {% set valkey_server_packages = ['valkey'] %}
-{% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-        {% set valkey_server_packages = ['valkey/bookworm-backports'] %}
-    {% else %}
-        {% set valkey_server_packages = ['valkey'] %}
-    {% endif %}
 {% endif %}
+
+{% set valkey_server_packages = ['valkey'] %}
+
 {{ macros.install_packages(valkey_server_packages | customizable("packages")) }}
 
 {{ macros.kolla_patch_sources() }}