diff options
| author | seth <[email protected]> | 2024-01-25 08:20:48 -0500 |
|---|---|---|
| committer | seth <[email protected]> | 2024-01-25 11:16:13 -0500 |
| commit | c9e0dd7c15260eb73d59b9996a5a9a17548afd59 (patch) | |
| tree | b23d24c9e463a76205ac464e381cb9e6685013f5 /nvidia | |
| parent | 4a2a030af2daef14c40a16e00ad186ac77796cea (diff) | |
don't use script files
Diffstat (limited to 'nvidia')
| -rw-r--r-- | nvidia/Containerfile | 16 | ||||
| -rwxr-xr-x | nvidia/install.sh | 16 |
2 files changed, 12 insertions, 20 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 diff --git a/nvidia/install.sh b/nvidia/install.sh deleted file mode 100755 index f3c577f..0000000 --- a/nvidia/install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -set -euxo pipefail - -NVIDIA_VERSION="${1:-}" - -if [ -z "${NVIDIA_VERSION}" ]; then - echo "I need a major version of a NVIDIA driver! (i.e., 535)" - exit 1 -fi - -rpm-ostree install /tmp/akmods/akmods-cert/getchoo-akmods-cert*.rpm - -rpm-ostree install \ - xorg-x11-drv-nvidia-{cuda,power}-"$NVIDIA_VERSION"* \ - nvidia-vaapi-driver \ - /tmp/akmods/kmods/kmod-nvidia-*.rpm |