From 52d8af51544351e73464e73e2959cfb912cb5a24 Mon Sep 17 00:00:00 2001 From: ver4a Date: Thu, 14 Nov 2024 14:56:30 +0100 Subject: [PATCH] Apply dnf configuration at start of build --- Dockerfile.gnome | 3 +++ Dockerfile.kde | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Dockerfile.gnome b/Dockerfile.gnome index 0802b3a..3c89c93 100644 --- a/Dockerfile.gnome +++ b/Dockerfile.gnome @@ -1,5 +1,8 @@ FROM quay.io/fedora-ostree-desktops/silverblue:41 +# dnf configuration has to be in effect during build +COPY etc/dnf /etc/dnf + # Add rpmfusion repositories (this sometimes fails, so it has 3 tries before failing the build) RUN (dnf5 -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm) || \ (sleep 60 && dnf5 -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm) || \ diff --git a/Dockerfile.kde b/Dockerfile.kde index 95f6017..a2a0987 100644 --- a/Dockerfile.kde +++ b/Dockerfile.kde @@ -1,5 +1,8 @@ FROM quay.io/fedora-ostree-desktops/kinoite:41 +# dnf configuration has to be in effect during build +COPY etc/dnf /etc/dnf + # Add rpmfusion repositories (this sometimes fails, so it has 3 tries before failing the build) RUN (dnf5 -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm) || \ (sleep 60 && dnf5 -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm) || \