From d5eb8ee7c3b57a8b3d8e6a042fa27a80b8ac478d Mon Sep 17 00:00:00 2001 From: ver4a Date: Tue, 12 Nov 2024 16:21:26 +0100 Subject: [PATCH] Retry adding rpmfusion repositories on fail --- Dockerfile.gnome | 6 ++++-- Dockerfile.gnome-nvidia | 6 ++++-- Dockerfile.kde | 6 ++++-- Dockerfile.kde-nvidia | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Dockerfile.gnome b/Dockerfile.gnome index d7d33c8..db0b1d9 100644 --- a/Dockerfile.gnome +++ b/Dockerfile.gnome @@ -1,7 +1,9 @@ FROM quay.io/fedora-ostree-desktops/silverblue:41 -# Add rpmfusion repositories -RUN rpm-ostree 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 (this sometimes fails, so it has 3 tries before failing the build) +RUN (rpm-ostree 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 && rpm-ostree 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 && rpm-ostree 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 rpm-ostree override remove libavcodec-free libavfilter-free libpostproc-free libswresample-free libswscale-free libavutil-free libavformat-free ffmpeg-free libavdevice-free --install=ffmpeg diff --git a/Dockerfile.gnome-nvidia b/Dockerfile.gnome-nvidia index dc4ae4d..3d801ae 100644 --- a/Dockerfile.gnome-nvidia +++ b/Dockerfile.gnome-nvidia @@ -1,7 +1,9 @@ FROM quay.io/fedora-ostree-desktops/silverblue:41 -# Add rpmfusion repositories -RUN rpm-ostree 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 (this sometimes fails, so it has 3 tries before failing the build) +RUN (rpm-ostree 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 && rpm-ostree 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 && rpm-ostree 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 rpm-ostree override remove libavcodec-free libavfilter-free libpostproc-free libswresample-free libswscale-free libavutil-free libavformat-free ffmpeg-free libavdevice-free --install=ffmpeg diff --git a/Dockerfile.kde b/Dockerfile.kde index b0a0985..3b613ef 100644 --- a/Dockerfile.kde +++ b/Dockerfile.kde @@ -1,7 +1,9 @@ FROM quay.io/fedora-ostree-desktops/kinoite:41 -# Add rpmfusion repositories -RUN rpm-ostree 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 (this sometimes fails, so it has 3 tries before failing the build) +RUN (rpm-ostree 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 && rpm-ostree 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 && rpm-ostree 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 rpm-ostree override remove libavcodec-free libavfilter-free libpostproc-free libswresample-free libswscale-free libavutil-free libavformat-free ffmpeg-free libavdevice-free --install=ffmpeg diff --git a/Dockerfile.kde-nvidia b/Dockerfile.kde-nvidia index 6c6ac71..d11d613 100644 --- a/Dockerfile.kde-nvidia +++ b/Dockerfile.kde-nvidia @@ -1,7 +1,9 @@ FROM quay.io/fedora-ostree-desktops/kinoite:41 -# Add rpmfusion repositories -RUN rpm-ostree 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 (this sometimes fails, so it has 3 tries before failing the build) +RUN (rpm-ostree 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 && rpm-ostree 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 && rpm-ostree 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 rpm-ostree override remove libavcodec-free libavfilter-free libpostproc-free libswresample-free libswscale-free libavutil-free libavformat-free ffmpeg-free libavdevice-free --install=ffmpeg