From c9e0dd7c15260eb73d59b9996a5a9a17548afd59 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 25 Jan 2024 08:20:48 -0500
Subject: don't use script files

---
 nvidia/Containerfile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'nvidia/Containerfile')

diff --git a/nvidia/Containerfile b/nvidia/Containerfile
index 31f6da8..830432f 100644
--- a/nvidia/Containerfile
+++ b/nvidia/Containerfile
@@ -2,12 +2,20 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-getchblue}"
 ARG BASE_IMAGE="ghcr.io/getchoo/${IMAGE_FLAVOR}"
 ARG FEDORA_VERSION="${FEDORA_VERSION:-39}"
 
-FROM ${BASE_IMAGE}:${FEDORA_VERSION} as builder
+FROM ${BASE_IMAGE}:${FEDORA_VERSION}
 ARG FEDORA_VERSION="${FEDORA_VERSION:-39}"
 ARG NVIDIA_VERSION="${NVIDIA_VERSION:-535}"
 
-COPY install.sh /tmp/install.sh
+# copy our signed artifacts over
 COPY --from=ghcr.io/getchoo/akmods:${FEDORA_VERSION}-${NVIDIA_VERSION} /rpms /tmp/akmods
 
-RUN /tmp/install.sh ${NVIDIA_VERSION} && rpm-ostree cleanup -m && \
-	rm -rf /tmp/* /var/* && ostree container commit
+# install our pub cert to import, along with signed kmods
+RUN rpm-ostree install \
+	/tmp/akmods/akmods-cert/getchoo-akmods-cert*.rpm \
+	xorg-x11-drv-nvidia-{cuda,power}-${NVIDIA_VERSION}* \
+	nvidia-vaapi-driver \
+	/tmp/akmods/kmods/kmod-nvidia-*.rpm
+
+RUN rpm-ostree cleanup -m && \
+	rm -rf /tmp/* /var/* && \
+	ostree container commit
-- 
cgit v1.2.3