From fec2c701dc36ea8d246b69290f5546bf37d414b3 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Tue, 23 Jun 2020 11:34:09 +0200 Subject: Use upstream Erlang on CentOS 8 Train only. In CentOS 8 Train we had a mix of rmq upstream and rdo packages, erlang was from RDO and rmq (3.7) from rmq. As this is not really tested by any other party, I propose to unify the sources of both. Change-Id: I52094ce9e3d98cbdedfdc23c8a43dd3093ce1771 Closes-bug: #1884034 --- docker/bifrost/bifrost-base/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/bifrost') diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index adc8c79dc..828a44001 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -28,7 +28,7 @@ WORKDIR /bifrost {% if base_package_type == 'rpm' %} {# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #} -RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \ +RUN rm -f /etc/yum.repos.d/{rabbitmq_rabbitmq-server,rabbitmq_rabbitmq-erlang}.repo \ {%- if distro_package_manager == 'dnf' %} && dnf config-manager --enable epel \ {% else %} -- cgit v1.2.3