openstack/kolla
Code Issues Proposed changes

debian: use valkey from bookworm-backports

Browse Source 
To fix arm64 valkey build.
The virtual `valkey` resolves to `valkey-server` in bookworm-backports,
but our global -1000 pin blocks it. Amd64 worked only because extrepo
shipped it. Use valkey directly from the backports packages instead.

follow up to https://review.opendev.org/c/openstack/kolla/+/932174

Change-Id: I846e4f19696ca28758cb9c0400be96c01b079daa
Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
This commit is contained in:
Bartosz Bezak
2025-11-03 11:43:59 +01:00
parent 5ad545cc72
commit 477f71b6ba
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/valkey/valkey-sentinel/Dockerfile.j2
View File

@@ -11,7 +11,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['epel']) }}
{% set valkey_sentinel_packages = ['valkey'] %}
{% elif base_package_type == 'deb' %}
{% set valkey_sentinel_packages = ['valkey-sentinel'] %}
{% if base_distro == 'debian' %}
{% set valkey_sentinel_packages = ['valkey-sentinel/bookworm-backports'] %}
{% else %}
{% set valkey_sentinel_packages = ['valkey-sentinel'] %}
{% endif %}
{% endif %}
{{ macros.install_packages(valkey_sentinel_packages | customizable("packages")) }}

6
docker/valkey/valkey-server/Dockerfile.j2
View File

@@ -11,7 +11,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['epel']) }}
{% set valkey_server_packages = ['valkey'] %}
{% elif base_package_type == 'deb' %}
{% set valkey_server_packages = ['valkey'] %}
{% if base_distro == 'debian' %}
{% set valkey_server_packages = ['valkey/bookworm-backports'] %}
{% else %}
{% set valkey_server_packages = ['valkey'] %}
{% endif %}
{% endif %}
{{ macros.install_packages(valkey_server_packages | customizable("packages")) }}