From cee27f6426f49b4242b0535d0e0dee6f8a44dbda Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 24 Oct 2025 16:58:36 +0200 Subject: Switch to Debian Trixie Change-Id: Ib7f551d4a7c6ffe95786853d6899e704de4747b8 Signed-off-by: Michal Nasiadka --- docker/valkey/valkey-sentinel/Dockerfile.j2 | 6 +----- docker/valkey/valkey-server/Dockerfile.j2 | 10 +++------- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'docker/valkey') 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() }} -- cgit v1.2.3