From 0e83e2a739cdd412dfa1abc9e45218187be31af2 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 21 Jun 2023 09:53:13 +0200 Subject: rabbitmq: use erlang-25 ppa on Debian/Ubuntu RMQ team is now maintaining erlang-24, erlang-25 ppas, see [1]. [1]: https://github.com/rabbitmq/erlang-debian-package/discussions/33 Change-Id: I7e289bd5ce52319604717e0b319d0642a8e598db (cherry picked from commit 0e881148d0036f27b95c5a27459e527fb3b0476d) --- docker/base/Dockerfile.j2 | 2 +- docker/base/apt_preferences.debian | 4 ---- docker/base/apt_preferences.ubuntu | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b351ce592..f056a8349 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -287,7 +287,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom ] %} {% set base_apt_keys = [ - {'name': 'erlang-ppa', 'keyid': 'E495BB49CC4BBE5B'}, + {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}, {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 7b5d4631b..f20d6ad4d 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.10.* Pin-Priority: 1000 -Package: erlang* -Pin: version 1:25.* -Pin-Priority: 1000 - # NOTE(hrw): we do not want backports unless requested Package: * Pin: release n=bullseye-backports diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 8e6a9070f..940130c9b 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.10.* Pin-Priority: 1000 -Package: erlang* -Pin: version 1:25.* -Pin-Priority: 1000 - Package: * Pin: origin dlm.mariadb.com Pin-Priority: 1000 -- cgit v1.2.3