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

Fixing upgrade issues, upgrading server to f44

Browse Source
This commit is contained in:
ben committed 2026-07-04 21:12:29 -04:00
1 parent 358a730612
commit 25a2463c23
5 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Containerfile-asrock-x570
+1 -1
View File
@@ -17,5 +17,5 @@ RUN echo "%_without_kmod_nvidia_detect 1" > /etc/rpm/macros.nvidia-kmod && \
# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed # FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \ 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,7 +28,8 @@ RUN git clone https://github.com/johnfanv2/LenovoLegionLinux.git && \
# Any more than that means that dnf automatically added a new one, which is shady! # Any more than that means that dnf automatically added a new one, which is shady!
# Then: cleanup image for linting # Then: cleanup image for linting
# Finally: verify image is good # Finally: verify image is good
# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \ rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings bootc container lint --fatal-warnings --skip nonempty-run-tmp
Containerfile-supermicro-x10drh
+4 -3
View File
@@ -10,7 +10,7 @@ WORKDIR /gocryptfs
RUN ./build-without-openssl.bash RUN ./build-without-openssl.bash
# ====== Stage 2: Server image ====== # ====== Stage 2: Server image ======
FROM quay.io/fedora/fedora-silverblue:43 FROM quay.io/fedora/fedora-silverblue:44
COPY --from=builder /gocryptfs/gocryptfs /usr/bin/gocryptfs COPY --from=builder /gocryptfs/gocryptfs /usr/bin/gocryptfs
@@ -24,9 +24,9 @@ RUN rpm --import \
/keys/zrepl-rpm-pkgs \ /keys/zrepl-rpm-pkgs \
/keys/RPM-GPG-KEY-rpmfusion-free-fedora-2020 \ /keys/RPM-GPG-KEY-rpmfusion-free-fedora-2020 \
/keys/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 \ /keys/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 \
/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 && \ rm -rf /keys && \
dnf5 install -y https://github.com/zfsonlinux/zfsonlinux.github.com/raw/master/fedora/zfs-release-3-0$(rpm --eval "%{dist}").noarch.rpm \ dnf5 install -y https://github.com/zfsonlinux/zfsonlinux.github.com/raw/master/fedora/zfs-release-3-1$(rpm --eval "%{dist}").noarch.rpm \
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ 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 && \ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
dnf5 install -y \ dnf5 install -y \
@@ -106,3 +106,4 @@ RUN test -f /usr/lib/sysusers.d/libvirt.conf || echo -e 'g libvirt 963' > /usr/l
RUN [[ 7 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ RUN [[ 7 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \ rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings --skip nonempty-run-tmp bootc container lint --fatal-warnings --skip nonempty-run-tmp
Containerfile-workstation-nvidia-base
+2 -1
View File
@@ -63,11 +63,12 @@ RUN rpm -q akmod-nvidia && \
# Any more than that means that dnf automatically added a new one, which is shady! # Any more than that means that dnf automatically added a new one, which is shady!
# Then: cleanup image for linting # Then: cleanup image for linting
# Finally: verify image is good # Finally: verify image is good
# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
RUN echo "" && \ RUN echo "" && \
echo "Expecting 11 keys to follow this line!" && \ echo "Expecting 11 keys to follow this line!" && \
rpm -qa gpg-pubkey* && \ rpm -qa gpg-pubkey* && \
echo "" && \ echo "" && \
[[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \ [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
rm -rf /var /boot && mkdir /var /boot && \ rm -rf /var /boot && mkdir /var /boot && \
bootc container lint --fatal-warnings bootc container lint --fatal-warnings --skip nonempty-run-tmp
supermicro-x10drh/nvidia-container-toolkit.repo
+1 -4
View File
@@ -5,8 +5,6 @@ repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
[nvidia-container-toolkit-experimental] [nvidia-container-toolkit-experimental]
name=nvidia-container-toolkit-experimental name=nvidia-container-toolkit-experimental
@@ -15,5 +13,4 @@ repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=0 enabled=0
gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt