diff --git a/Dockerfile.gnome b/Dockerfile.gnome index db0b1d9..0802b3a 100644 --- a/Dockerfile.gnome +++ b/Dockerfile.gnome @@ -1,29 +1,26 @@ FROM quay.io/fedora-ostree-desktops/silverblue:41 # 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) +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) # 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 +RUN dnf5 -y install --allowerasing ffmpeg # Install openh264 -RUN rpm-ostree override remove noopenh264 --install openh264 --install mozilla-openh264 +RUN dnf5 -y swap noopenh264 openh264 && dnf5 -y install mozilla-openh264 # Bulk of layered packages -RUN rpm-ostree install virt-manager vim neovim bat btop pv restic zstd nmap-ncat +RUN dnf5 -y install virt-manager vim neovim bat btop pv restic zstd nmap-ncat RUN systemctl enable libvirtd # Set vim as default editor -RUN rpm-ostree override remove nano-default-editor --install vim-default-editor +RUN dnf5 -y swap nano-default-editor vim-default-editor # Remove default color prompt (is replaced with a custom one) -RUN rpm-ostree override remove bash-color-prompt - -# Remove rpm metadata cache -RUN rpm-ostree cleanup --repomd +RUN dnf5 -y remove bash-color-prompt # Apply configuration COPY etc /etc diff --git a/Dockerfile.kde b/Dockerfile.kde index 3b613ef..95f6017 100644 --- a/Dockerfile.kde +++ b/Dockerfile.kde @@ -1,29 +1,26 @@ FROM quay.io/fedora-ostree-desktops/kinoite:41 # 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) +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) # 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 +RUN dnf5 -y install --allowerasing ffmpeg # Install openh264 -RUN rpm-ostree override remove noopenh264 --install openh264 --install mozilla-openh264 +RUN dnf5 -y swap noopenh264 openh264 && dnf5 -y install mozilla-openh264 # Bulk of layered packages -RUN rpm-ostree install virt-manager vim neovim bat btop pv restic zstd nmap-ncat +RUN dnf5 -y install virt-manager vim neovim bat btop pv restic zstd nmap-ncat RUN systemctl enable libvirtd # Set vim as default editor -RUN rpm-ostree override remove nano-default-editor --install vim-default-editor +RUN dnf5 -y swap nano-default-editor vim-default-editor # Remove default color prompt (is replaced with a custom one) -RUN rpm-ostree override remove bash-color-prompt - -# Remove rpm metadata cache -RUN rpm-ostree cleanup --repomd +RUN dnf5 -y remove bash-color-prompt # Apply configuration COPY etc /etc