diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 0ccc2e0167..f77258d05a 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,10 +1,9 @@ Package: rabbitmq-server -Pin: version 3.8.* +Pin: version 3.9.* Pin-Priority: 1000 -# RabbitMQ wants 23+ and we want to stay on 23 if possible Package: erlang* -Pin: version 1:23.* +Pin: version 1:24.* Pin-Priority: 1000 # NOTE(mgoddard): logstash 7.9.x is the last version that supports diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index fd8609d942..76334e51bf 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,9 +1,9 @@ Package: rabbitmq-server -Pin: version 3.8.* +Pin: version 3.9.* Pin-Priority: 1000 Package: erlang* -Pin: version 1:23.* +Pin: version 1:24.* Pin-Priority: 1000 # NOTE(mgoddard): logstash 7.9.x is the last version that supports diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c1d7779d62..150dc5ab9d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -24,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set kolla_toolbox_packages = [ 'crudini', - 'erlang-23.*', + 'erlang-24.*', 'gcc', 'gdisk', 'git', @@ -37,7 +37,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssl-devel', 'openvswitch', 'python3-devel', - 'rabbitmq-server-3.8.*' + 'rabbitmq-server-3.9.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 854f0d2f38..0263184924 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -20,9 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ - 'erlang-23.*', + 'erlang-24.*', 'hostname', - 'rabbitmq-server-3.8.*' + 'rabbitmq-server-3.9.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/releasenotes/notes/rabbitmq-39-6791f54358018428.yaml b/releasenotes/notes/rabbitmq-39-6791f54358018428.yaml new file mode 100644 index 0000000000..0f4a8ab20e --- /dev/null +++ b/releasenotes/notes/rabbitmq-39-6791f54358018428.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + RabbitMQ version has been updated to 3.9 (together with Erlang to 24).