From c4d227cddca59694e992d9054940bc6057d1b1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Sat, 2 Oct 2021 15:06:40 +0000 Subject: [PATCH] [bifrost] Drop workarounds These are no longer required but block other cleanups. Change-Id: I13bc63447da878890730e9458b48267a8530d5af --- docker/bifrost/bifrost-base/Dockerfile.j2 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 10e895441d..e05d80218a 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -31,15 +31,6 @@ RUN ln -s bifrost-base-source/* bifrost \ 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 \ - && dnf clean all && rm -rf /var/dnf/cache -{% elif base_package_type == 'deb' %} -RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \ - && apt-get purge -y mariadb* mysql* -{% endif %} - {# ANSIBLE_GATHER_TIMEOUT is a workaround for https://github.com/ansible/ansible/issues/43884 #} ENV ANSIBLE_GATHER_TIMEOUT=30