diff options
| author | Bartosz Bezak <bartosz@stackhpc.com> | 2025-11-03 11:43:59 +0100 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2025-11-05 14:22:31 +0100 |
| commit | 477f71b6ba8dd9472ecccd16ac9a5aa79d82eaf0 (patch) | |
| tree | f35c26d4a038b174d07c871c9f4c6651104eba3f /docker | |
| parent | 5ad545cc725e1f072784fe4973ed6428963ea0fc (diff) | |
| download | kolla-477f71b6ba8dd9472ecccd16ac9a5aa79d82eaf0.tar.gz kolla-477f71b6ba8dd9472ecccd16ac9a5aa79d82eaf0.zip | |
debian: use valkey from bookworm-backports
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>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/valkey/valkey-sentinel/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/valkey/valkey-server/Dockerfile.j2 | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/docker/valkey/valkey-sentinel/Dockerfile.j2 index 9cdfac282..e3045d2fe 100644 --- a/docker/valkey/valkey-sentinel/Dockerfile.j2 +++ b/docker/valkey/valkey-sentinel/Dockerfile.j2 @@ -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")) }} diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/docker/valkey/valkey-server/Dockerfile.j2 index 046260d7b..7b989f66b 100644 --- a/docker/valkey/valkey-server/Dockerfile.j2 +++ b/docker/valkey/valkey-server/Dockerfile.j2 @@ -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")) }} |