From b28dce673344358a8679955a8a1e7f370edbda12 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 13 Nov 2024 15:59:15 +0100 Subject: [PATCH] rpm: remove rpmlint from Dockerfiles as it's not used Commit 784a53cec5061e6a718acc3a7104c61215c15078 added `rpmlint` to the Dockerfiles and added a step in the Dockerfile to validate the SPEC files. The validation step was removed in c245ce12c1e0a092ef21094b287b8cb94a51ee1e, but didn't remove the step to install the package. The `rpmlint` package is also being removed from CentOS Stream 10 ("CS10"); - https://issues.redhat.com/browse/CS-2451 - https://issues.redhat.com/browse/CS-2453 Remove the package as it's not used currently. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 38309c1b6020246bdad19b14116c08b40c72c7c8) Signed-off-by: Sebastiaan van Stijn --- rpm/centos-9/Dockerfile | 2 +- rpm/fedora-39/Dockerfile | 2 +- rpm/fedora-40/Dockerfile | 2 +- rpm/fedora-41/Dockerfile | 2 +- rpm/rhel-8/Dockerfile | 2 +- rpm/rhel-9/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpm/centos-9/Dockerfile b/rpm/centos-9/Dockerfile index cec8acfef0..c04299c12f 100644 --- a/rpm/centos-9/Dockerfile +++ b/rpm/centos-9/Dockerfile @@ -25,7 +25,7 @@ ENV SUITE=${SUITE} # https://forums.centos.org/viewtopic.php?f=54&t=72574, and # https://access.redhat.com/solutions/3720351 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial -RUN dnf install -y rpm-build rpmlint dnf-plugins-core +RUN dnf install -y rpm-build dnf-plugins-core RUN dnf config-manager --set-enabled crb COPY --link SPECS /root/rpmbuild/SPECS diff --git a/rpm/fedora-39/Dockerfile b/rpm/fedora-39/Dockerfile index 7a476863fb..5478277f76 100644 --- a/rpm/fedora-39/Dockerfile +++ b/rpm/fedora-39/Dockerfile @@ -18,7 +18,7 @@ ARG DISTRO ARG SUITE ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint dnf-plugins-core +RUN dnf install -y rpm-build dnf-plugins-core COPY --link SPECS /root/rpmbuild/SPECS RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --link --from=golang /usr/local/go /usr/local/go diff --git a/rpm/fedora-40/Dockerfile b/rpm/fedora-40/Dockerfile index 3d717c491d..1fa0e8c2c1 100644 --- a/rpm/fedora-40/Dockerfile +++ b/rpm/fedora-40/Dockerfile @@ -18,7 +18,7 @@ ARG DISTRO ARG SUITE ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint dnf-plugins-core +RUN dnf install -y rpm-build dnf-plugins-core COPY --link SPECS /root/rpmbuild/SPECS RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --link --from=golang /usr/local/go /usr/local/go diff --git a/rpm/fedora-41/Dockerfile b/rpm/fedora-41/Dockerfile index ac1c5b7404..322184bfc1 100644 --- a/rpm/fedora-41/Dockerfile +++ b/rpm/fedora-41/Dockerfile @@ -18,7 +18,7 @@ ARG DISTRO ARG SUITE ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint dnf-plugins-core +RUN dnf install -y rpm-build dnf-plugins-core # FIXME(thaJeztah): workaround for building on Fedora 41 on arm64 # # This is the equivalent of https://github.com/docker/containerd-packaging/pull/390 diff --git a/rpm/rhel-8/Dockerfile b/rpm/rhel-8/Dockerfile index 89152a39f2..13d256594d 100644 --- a/rpm/rhel-8/Dockerfile +++ b/rpm/rhel-8/Dockerfile @@ -37,7 +37,7 @@ ARG SUITE ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint +RUN dnf install -y rpm-build COPY --link SPECS /root/rpmbuild/SPECS RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --link --from=golang /usr/local/go /usr/local/go diff --git a/rpm/rhel-9/Dockerfile b/rpm/rhel-9/Dockerfile index 457690a74b..c9a198ef2d 100644 --- a/rpm/rhel-9/Dockerfile +++ b/rpm/rhel-9/Dockerfile @@ -37,7 +37,7 @@ ARG SUITE ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} -RUN dnf install -y rpm-build rpmlint +RUN dnf install -y rpm-build COPY --link SPECS /root/rpmbuild/SPECS RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --link --from=golang /usr/local/go /usr/local/go