diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 394fff1fe4..99d2c9a4d4 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,5 +1,9 @@ Package: rabbitmq-server -Pin: version 3.12.* +Pin: version 3.13.* +Pin-Priority: 1000 + +Package: erlang +Pin: version 26.2.* Pin-Priority: 1000 # NOTE(hrw): we do not want backports unless requested diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 9c6eae9b18..64b589362e 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,5 +1,9 @@ Package: rabbitmq-server -Pin: version 3.12.* +Pin: version 3.13.* +Pin-Priority: 1000 + +Package: erlang +Pin: version 26.2.* Pin-Priority: 1000 Package: * diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 273ddb4e76..c5e17a20ec 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set kolla_toolbox_packages = [ 'crudini', - 'erlang-26.*', + 'erlang-26.2.*', 'gcc', 'gdisk', 'git', @@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssl-devel', 'openvswitch', 'python3-devel', - 'rabbitmq-server-3.12.*' + 'rabbitmq-server-3.13.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index e6dacba04e..444f29b50a 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -15,8 +15,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ - 'erlang-26.*', - 'rabbitmq-server-3.12.*' + 'erlang-26.2.*', + 'rabbitmq-server-3.13.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/releasenotes/notes/rabbitmq-3-13-56852b220fd50bc0.yaml b/releasenotes/notes/rabbitmq-3-13-56852b220fd50bc0.yaml new file mode 100644 index 0000000000..2e7e41b624 --- /dev/null +++ b/releasenotes/notes/rabbitmq-3-13-56852b220fd50bc0.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + ``RabbitMQ`` version has been upgraded to ``3.13`` and ``Erlang`` + version has been upgraded to ``26.2`` (maximum supported by + ``RabbitMQ 3.13``).