From a0f651a2c66ca3b7cb7807ae65bccc3eac295fe1 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 5 Aug 2023 14:53:54 +0200 Subject: [PATCH] rpm: set nobest flag for dnf builddep command Signed-off-by: CrazyMax --- pkg/buildx/Dockerfile | 2 +- pkg/compose/Dockerfile | 2 +- pkg/containerd/Dockerfile | 2 +- pkg/credential-helpers/Dockerfile | 2 +- pkg/docker-cli/Dockerfile | 2 +- pkg/docker-engine/Dockerfile | 2 +- pkg/sbom/Dockerfile | 2 +- pkg/scan/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/buildx/Dockerfile b/pkg/buildx/Dockerfile index fb2002aa..5163befe 100644 --- a/pkg/buildx/Dockerfile +++ b/pkg/buildx/Dockerfile @@ -128,7 +128,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile index 3bd662e8..ea9df165 100644 --- a/pkg/compose/Dockerfile +++ b/pkg/compose/Dockerfile @@ -131,7 +131,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index afa32435..66965b57 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -165,7 +165,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/credential-helpers/Dockerfile b/pkg/credential-helpers/Dockerfile index 3d05f000..66a2f393 100644 --- a/pkg/credential-helpers/Dockerfile +++ b/pkg/credential-helpers/Dockerfile @@ -128,7 +128,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index c4a09e0d..22bde43b 100644 --- a/pkg/docker-cli/Dockerfile +++ b/pkg/docker-cli/Dockerfile @@ -143,7 +143,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile index fc50291e..57a95322 100644 --- a/pkg/docker-engine/Dockerfile +++ b/pkg/docker-engine/Dockerfile @@ -145,7 +145,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/sbom/Dockerfile b/pkg/sbom/Dockerfile index a2ca0d3c..1e9d7373 100644 --- a/pkg/sbom/Dockerfile +++ b/pkg/sbom/Dockerfile @@ -128,7 +128,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else diff --git a/pkg/scan/Dockerfile b/pkg/scan/Dockerfile index e401da93..07013877 100644 --- a/pkg/scan/Dockerfile +++ b/pkg/scan/Dockerfile @@ -128,7 +128,7 @@ RUN < /dev/null; then - builddepCmd="setarch $(xx-info rhel-arch) dnf builddep" + builddepCmd="setarch $(xx-info rhel-arch) dnf builddep --nobest" elif command -v yum-builddep &> /dev/null; then builddepCmd="yum-builddep --target $(xx-info rhel-arch)" else