From 1dba21d012884e2d101b635787c7233fb27b060b Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 21 Jun 2023 17:20:03 +0000 Subject: Revert "rabbitmq: pin to 3.11.16" This reverts commit 600ed4f149a1cf542f54d7fc5005030f53c69a83. Reason for revert: 3.11.18 is out with a fix Change-Id: I4659bcd48ea32294b3ee84af9af94fae32b38bf3 --- docker/base/apt_preferences.debian | 2 +- docker/base/apt_preferences.ubuntu | 2 +- docker/kolla-toolbox/Dockerfile.j2 | 2 +- docker/rabbitmq/Dockerfile.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 9098c77b8..80670698c 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.11.16-1 +Pin: version 3.11.* Pin-Priority: 1000 Package: erlang* diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 3d38f003c..81e651620 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.11.16-1 +Pin: version 3.11.* Pin-Priority: 1000 Package: erlang* diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 7d4804c31..def4792fc 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssl-devel', 'openvswitch', 'python3-devel', - 'rabbitmq-server-3.11.16' + 'rabbitmq-server-3.11.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index e5ba8a3a8..c17cf0a19 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set rabbitmq_packages = [ 'erlang-25.*', - 'rabbitmq-server-3.11.16' + 'rabbitmq-server-3.11.*' ] %} {% elif base_package_type == 'deb' %} -- cgit v1.2.3