From 4653fd6a085469953822903bae7ce9fd5c6fdb60 Mon Sep 17 00:00:00 2001 From: ver4a Date: Sun, 17 Nov 2024 18:56:49 +0100 Subject: [PATCH] Remove retrying repository install This was most likely caused by networking issues unrelated to the build, so this workaround will be reversed to not hide any more problems. --- Dockerfile.gnome | 7 ++----- Dockerfile.kde | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile.gnome b/Dockerfile.gnome index b8afc87..59580a2 100644 --- a/Dockerfile.gnome +++ b/Dockerfile.gnome @@ -3,11 +3,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) || \ - (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) - +# Add rpmfusion repositories +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 # Install ffmpeg (removing all the -free replacements is required) RUN dnf5 -y install --allowerasing ffmpeg diff --git a/Dockerfile.kde b/Dockerfile.kde index b82bf7d..283bf7d 100644 --- a/Dockerfile.kde +++ b/Dockerfile.kde @@ -3,11 +3,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) || \ - (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) - +# Add rpmfusion repositories +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 # Install ffmpeg (removing all the -free replacements is required) RUN dnf5 -y install --allowerasing ffmpeg