Merge pull request #1105 from thaJeztah/remove_rpmlint

thaJeztah · web-flow · commit 61d439439711 · 2024-11-13T17:53:27.000+01:00
[master] rpm: remove rpmlint from Dockerfiles as it's not used
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ ARG DISTRO`
`18`	`18`	`ARG SUITE`
`19`	`19`	`ENV DISTRO=${DISTRO}`
`20`	`20`	`ENV SUITE=${SUITE}`
`21`		`-RUN dnf install -y rpm-build rpmlint dnf-plugins-core`
	`21`	`+RUN dnf install -y rpm-build dnf-plugins-core`
`22`	`22`	`# FIXME(thaJeztah): workaround for building on Fedora 41 on arm64`
`23`	`23`	`#`
`24`	`24`	`# This is the equivalent of https://github.com/docker/containerd-packaging/pull/390`