diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-06-21 09:53:13 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-06-21 10:48:04 +0000 |
| commit | 0e881148d0036f27b95c5a27459e527fb3b0476d (patch) | |
| tree | d0f8ce1c2be6a8226e7e94743f189f08e57f111b /docker | |
| parent | 11f90f3746f6affd34885019a82eb94d3c098ee9 (diff) | |
| download | kolla-0e881148d0036f27b95c5a27459e527fb3b0476d.tar.gz kolla-0e881148d0036f27b95c5a27459e527fb3b0476d.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 4 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index da40ea6c0..311a2917d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -283,7 +283,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 9098c77b8..f2b0a7d0f 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.11.16-1 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 3d38f003c..dbee137dd 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.11.16-1 Pin-Priority: 1000 -Package: erlang* -Pin: version 1:25.* -Pin-Priority: 1000 - Package: * Pin: origin dlm.mariadb.com Pin-Priority: 1000 |