summaryrefslogtreecommitdiff
path: root/nvidia/Containerfile
diff options
context:
space:
mode:
authorseth <[email protected]>2024-01-25 08:20:48 -0500
committerseth <[email protected]>2024-01-25 11:16:13 -0500
commitc9e0dd7c15260eb73d59b9996a5a9a17548afd59 (patch)
treeb23d24c9e463a76205ac464e381cb9e6685013f5 /nvidia/Containerfile
parent4a2a030af2daef14c40a16e00ad186ac77796cea (diff)
don't use script files
Diffstat (limited to 'nvidia/Containerfile')
-rw-r--r--nvidia/Containerfile16
1 files changed, 12 insertions, 4 deletions
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