ben/silverblue-images
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Updating desktop images to 44"

Browse Source 
This reverts commit 7aeb946b6b.
This commit is contained in:
Ben Radey
2026-05-02 10:34:41 -04:00
parent 7aeb946b6b
commit ef6211c321
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Containerfile-asrock-x570
+2 -1
View File
@@ -14,6 +14,7 @@ RUN echo "%_without_kmod_nvidia_detect 1" > /etc/rpm/macros.nvidia-kmod && \
# 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 [[ 4 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings
bootc container lint --fatal-warnings --skip nonempty-run-tmp
Containerfile-lenovo-16arh7h
+2 -1
View File
@@ -28,6 +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 [[ 4 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings
bootc container lint --fatal-warnings --skip nonempty-run-tmp
Containerfile-supermicro-x10drh
+2 -1
View File
@@ -102,6 +102,7 @@ RUN test -f /usr/lib/sysusers.d/libvirt.conf || echo -e 'g libvirt 963' > /usr/l
# 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 [[ 7 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings
bootc container lint --fatal-warnings --skip nonempty-run-tmp
Containerfile-workstation-nvidia-base
+4 -3
View File
@@ -1,4 +1,4 @@
FROM quay.io/fedora/fedora-silverblue:44
FROM quay.io/fedora/fedora-silverblue:43
COPY gpg-keys/* /keys/
@@ -8,7 +8,7 @@ RUN rpm --import \
/keys/public_key_proton.asc \
/keys/RPM-GPG-KEY-rpmfusion-free-fedora-2020 \
/keys/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 \
/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-x86_64 && \
/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-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 \
@@ -59,6 +59,7 @@ RUN rpm -q akmod-nvidia && \
# 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 [[ 4 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings
bootc container lint --fatal-warnings --skip nonempty-run-tmp