From a53272abb7337c38415c290265cdb09a4995bedd Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 25 Jan 2024 12:37:45 -0500 Subject: tree-wide: use `FROM .. AS` over `COPY --from` --- nvidia/Containerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'nvidia') diff --git a/nvidia/Containerfile b/nvidia/Containerfile index 830432f..f19b01d 100644 --- a/nvidia/Containerfile +++ b/nvidia/Containerfile @@ -1,13 +1,16 @@ 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} -ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" ARG NVIDIA_VERSION="${NVIDIA_VERSION:-535}" +FROM ghcr.io/getchoo/akmods:${FEDORA_VERSION}-${NVIDIA_VERSION} as akmods + +FROM ${BASE_IMAGE}:${FEDORA_VERSION} as builder +ARG FEDORA_VERSION +ARG NVIDIA_VERSION + # copy our signed artifacts over -COPY --from=ghcr.io/getchoo/akmods:${FEDORA_VERSION}-${NVIDIA_VERSION} /rpms /tmp/akmods +COPY --from=akmods /rpms /tmp/akmods # install our pub cert to import, along with signed kmods RUN rpm-ostree install \ -- cgit v1.2.3