aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/base/apt_preferences.debian4
-rw-r--r--docker/base/apt_preferences.ubuntu4
-rw-r--r--docker/rabbitmq/Dockerfile.j24
-rw-r--r--releasenotes/notes/rabbitmq-310-8c9c6eeb5d5a2a75.yaml4
4 files changed, 10 insertions, 6 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 4c27082d4..24b13e190 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -1,9 +1,9 @@
Package: rabbitmq-server
-Pin: version 3.9.*
+Pin: version 3.10.*
Pin-Priority: 1000
Package: erlang*
-Pin: version 1:24.*
+Pin: version 1:25.*
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 76334e51b..2e5303988 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -1,9 +1,9 @@
Package: rabbitmq-server
-Pin: version 3.9.*
+Pin: version 3.10.*
Pin-Priority: 1000
Package: erlang*
-Pin: version 1:24.*
+Pin: version 1:25.*
Pin-Priority: 1000
# NOTE(mgoddard): logstash 7.9.x is the last version that supports
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 6dd08ef3f..8bfa6f579 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-24.*',
+ 'erlang-25.*',
'hostname',
- 'rabbitmq-server-3.9.*'
+ 'rabbitmq-server-3.10.*'
] %}
{% elif base_package_type == 'deb' %}
diff --git a/releasenotes/notes/rabbitmq-310-8c9c6eeb5d5a2a75.yaml b/releasenotes/notes/rabbitmq-310-8c9c6eeb5d5a2a75.yaml
new file mode 100644
index 000000000..3d69bcb45
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-310-8c9c6eeb5d5a2a75.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ RabbitMQ version has been updated to 3.10 (together with Erlang to 25).