1 changed files with 11 additions and 12 deletions
--- a/23
+++ b/23
@ -1,9 +1,6 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 ARG CACHEBUST=1

-ARG KERNEL=kernel-cachyos
-ENV KERNEL=${KERNEL}
-
 # Get list of kernels from my repo. If the list has been updated, then the image will be rebuilt. If it hasn't been updated, then caching of the previous build will be used.
 ADD "https://copr.fedorainfracloud.org/api_3/build/list?ownername=andersrh&projectname=my-ostree-os&packagename=kernel" /tmp/builds.txt

@ -15,11 +12,15 @@ RUN /tmp/set_next_version.sh
 COPY repo/*.repo /etc/yum.repos.d/
 RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo -y

-RUN dnf copr enable bieszczaders/kernel-cachyos -y
-
-RUN dnf install -y ${KERNEL} ${KERNEL}-devel-matched
-
-RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-tools kernel-tools-libs
+RUN dnf install -y $( \
+                                                                              dnf list --available kernel\* --disablerepo='*' --enablerepo=my-ostree-os-rhel-epel 2>/dev/null \
+                                                                              | grep 'andersdsrhcustom' \
+                                                                              | awk '{print $1 "-" $2}' \
+                                                                              | sort -V \
+                                                                              | tail -1 \
+                                                                              | sed 's/\.src//g' \
+                                                                              | sed 's/\.x86_64//g' \
+                                                                  )

 RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm

@ -27,8 +28,8 @@ RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.2.0/appimagelauncher-2.2.0-travis995.0f91801.x86_64.rpm

 # Install Negativo17 Nvidia driver
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
-RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-cachyos)
+RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver kernel-devel-matched
+RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel)

 # Remove plocate to avoid updatedb going crazy with scanning the file system once a day
 RUN dnf remove -y plocate
@ -47,8 +48,6 @@ RUN rm -f /etc/chromium/chromium.conf
 # Add rule to SELinux allowing modules to be loaded into custom kernel
 RUN setsebool -P domain_kernel_load_modules on

-RUN dnf install -y alsa-sof-firmware
-
 COPY etc /etc
 COPY usr /usr