diff options
| author | Zuul <zuul@review.opendev.org> | 2025-12-20 07:24:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-12-20 07:24:35 +0000 |
| commit | e203ff055b6eb07747b4fec92b2d58b16491dffd (patch) | |
| tree | dcdcbb42175d5f92fc857bfc1df5c6a78b535e96 /docker/valkey | |
| parent | cfebb40d863aacc5553553bd1b1d3e11c8c3e7e7 (diff) | |
| parent | cee27f6426f49b4242b0535d0e0dee6f8a44dbda (diff) | |
| download | kolla-e203ff055b6eb07747b4fec92b2d58b16491dffd.tar.gz kolla-e203ff055b6eb07747b4fec92b2d58b16491dffd.zip | |
Merge "Switch to Debian Trixie"
Diffstat (limited to 'docker/valkey')
| -rw-r--r-- | docker/valkey/valkey-sentinel/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/valkey/valkey-server/Dockerfile.j2 | 10 |
2 files changed, 4 insertions, 12 deletions
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() }} |