diff --git a/Containerfile-asrock-x570 b/Containerfile-asrock-x570 index 279959e..b7c65e0 100644 --- a/Containerfile-asrock-x570 +++ b/Containerfile-asrock-x570 @@ -15,6 +15,7 @@ RUN echo "%_without_kmod_nvidia_detect 1" > /etc/rpm/macros.nvidia-kmod && \ # Then: cleanup image for linting # Finally: verify image is good # FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed -RUN [[ 10 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ +RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ rm -rf /var /boot && mkdir /var /boot && \ - bootc container lint --fatal-warnings --skip nonempty-run-tmp + bootc container lint --fatal-warnings + diff --git a/Containerfile-lenovo-16arh7h b/Containerfile-lenovo-16arh7h index 6c531bf..28aded8 100644 --- a/Containerfile-lenovo-16arh7h +++ b/Containerfile-lenovo-16arh7h @@ -28,7 +28,7 @@ RUN git clone https://github.com/johnfanv2/LenovoLegionLinux.git && \ # Any more than that means that dnf automatically added a new one, which is shady! # Then: cleanup image for linting # Finally: verify image is good -# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed -RUN [[ 10 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ +RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ rm -rf /var /boot && mkdir /var /boot && \ - bootc container lint --fatal-warnings --skip nonempty-run-tmp + bootc container lint --fatal-warnings + diff --git a/Containerfile-workstation-nvidia-base b/Containerfile-workstation-nvidia-base index a5277c7..56b35cf 100644 --- a/Containerfile-workstation-nvidia-base +++ b/Containerfile-workstation-nvidia-base @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora-silverblue:43 +FROM quay.io/fedora/fedora-silverblue:44 COPY gpg-keys/* /keys/ @@ -9,7 +9,7 @@ RUN rpm --import \ /keys/RPM-GPG-KEY-rpmfusion-free-fedora-2020 \ /keys/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 \ /keys/brave-core.asc \ - /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-x86_64 && \ + /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-x86_64 && \ rm -rf /keys && \ dnf5 install -y 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 \ @@ -31,7 +31,6 @@ RUN rpm --import \ gnome-extensions-app \ gnome-shell-extension-dash-to-panel \ gnome-terminal \ - gnome-themes-extra \ gnome-tweaks \ htop \ iftop \ @@ -47,8 +46,6 @@ RUN rpm --import \ virt-manager \ vulkan-tools && \ dnf5 swap -y ffmpeg-free ffmpeg --allowerasing && \ - dnf5 swap -y mesa-va-drivers mesa-va-drivers-freeworld && \ - dnf5 swap -y mesa-vdpau-drivers mesa-vdpau-drivers-freeworld && \ dnf5 clean all # TODO: Remove this `|| true` hack once post scriptlets no longer make dnf exit with non-zero @@ -62,11 +59,15 @@ RUN rpm -q akmod-nvidia && \ rpm -q xorg-x11-drv-nvidia-cuda && \ rpm -q proton-vpn-gnome-desktop -# The first check makes sure that we have exactly 10 gpg pubkeys trusted in the rpmdb (the ones manually imported above) (Brave adds 6, apparently?). +# The first check makes sure that we have exactly 11 gpg pubkeys trusted in the rpmdb (the ones manually imported above) (Brave adds 6, apparently?). # Any more than that means that dnf automatically added a new one, which is shady! # Then: cleanup image for linting # Finally: verify image is good -# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed -RUN [[ 10 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ +RUN echo "" && \ + echo "Expecting 11 keys to follow this line!" && \ + rpm -qa gpg-pubkey* && \ + echo "" && \ + [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ rm -rf /var /boot && mkdir /var /boot && \ - bootc container lint --fatal-warnings --skip nonempty-run-tmp + bootc container lint --fatal-warnings +