From 3ee3c7d7c9702bb2f76d0e01f8bb6d4638e5b78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Mon, 26 Apr 2021 16:54:11 +0000 Subject: [PATCH] Pin erlang Now that we run without erlang pinned by the repository itself, let's pin it on our side. Change-Id: Ifa491b102ad0db7f6dc645ca552d83b53bcf3b46 (cherry picked from commit b54789d093d8f9e35265d313e95f9f89aceb4f4b) --- docker/base/apt_preferences.ubuntu | 4 ++++ docker/kolla-toolbox/Dockerfile.j2 | 1 + docker/rabbitmq/Dockerfile.j2 | 1 + 3 files changed, 6 insertions(+) diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 9792854d5e..c8e36affd0 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,3 +1,7 @@ Package: rabbitmq-server Pin: version 3.8.* Pin-Priority: 1000 + +Package: erlang* +Pin: version 1:23.* +Pin-Priority: 1000 diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 06e9bb2302..b067b1de01 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -19,6 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set kolla_toolbox_packages = [ 'crudini', + 'erlang-23.*', 'gcc', 'gdisk', 'git', diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 28c1ef5f65..77de38b569 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ 'hostname', + 'erlang-23.*', 'rabbitmq-server-3.8.*' ] %}