From b40506f6dd382e1b2443dc59b918b01e2db45850 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 12 Oct 2022 17:58:55 +0200 Subject: rabbitmq: use Erlang from PPA on Debian/Ubuntu PPA from Team RabbitMQ [1] provides newer Erlang for Debian/Ubuntu. This way we have latest Erlang on both distributions and both architectures. 1. https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang Change-Id: Iec7e8461f9eb757e1576cf3898068306c5436239 --- docker/base/Dockerfile.j2 | 6 +++--- docker/base/apt_preferences.debian | 6 ------ docker/base/apt_preferences.ubuntu | 6 ------ 3 files changed, 3 insertions(+), 15 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index d54a4680e..3dbf49770 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -318,9 +318,9 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom ] %} {% set base_apt_keys = [ - {'name': 'erlang', 'keyid': 'E495BB49CC4BBE5B'}, - {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, - {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, + {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}, + {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, + {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 51e5e2d2d..ba7e14b7f 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -6,12 +6,6 @@ Package: erlang* Pin: version 1:25.* Pin-Priority: 1000 -# On AArch64 we do not have Erlang 25 yet -Package: erlang* -Pin: version 1:24.* -Pin: release b=arm64 -Pin-Priority: 1000 - # NOTE(mgoddard): logstash 7.9.x is the last version that supports # Elasticsearch OSS. Package: logstash-oss diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index c6bce9e43..d6a262861 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -6,12 +6,6 @@ Package: erlang* Pin: version 1:25.* Pin-Priority: 1000 -# On AArch64 we do not have Erlang 25 yet -Package: erlang* -Pin: version 1:24.* -Pin: release b=arm64 -Pin-Priority: 1000 - # NOTE(mgoddard): logstash 7.9.x is the last version that supports # Elasticsearch OSS. Package: logstash-oss -- cgit v1.2.3