ver4a/ostree-native-containers
1
0
Fork 0
Code Activity Actions

Transition build completely to dnf5

Browse source 
This will allow for an overall more granular control over package installation,
such as disabling installation of weak dependencies, making resulting
images smaller.
This commit is contained in:
ver4a 2024-11-14 14:40:12 +01:00
parent e3814f5ba2
commit a308c59dfb
2 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dockerfile.gnome
View file

@ -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

19
Dockerfile.kde
View file

@ -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