diff options
| -rw-r--r-- | akmods/Containerfile | 4 | ||||
| -rw-r--r-- | base/Containerfile | 6 | ||||
| -rw-r--r-- | config/Containerfile | 2 | ||||
| -rw-r--r-- | nvidia/Containerfile | 11 |
4 files changed, 14 insertions, 9 deletions
diff --git a/akmods/Containerfile b/akmods/Containerfile index 8a6a01b..1fa966c 100644 --- a/akmods/Containerfile +++ b/akmods/Containerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/base" ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" FROM ${BASE_IMAGE}:${FEDORA_VERSION} as builder -ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" +ARG FEDORA_VERSION ARG NVIDIA_VERSION="${NVIDIA_VERSION:-535}" @@ -68,5 +68,5 @@ done # send it off -FROM scratch +FROM scratch as rpms COPY --from=builder /var/cache/rpms /rpms diff --git a/base/Containerfile b/base/Containerfile index 5d8088f..5d49bd7 100644 --- a/base/Containerfile +++ b/base/Containerfile @@ -2,13 +2,15 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-silverblue}" ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${IMAGE_FLAVOR}" ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" +FROM docker.io/mikefarah/yq as yq FROM ghcr.io/getchoo/config:${FEDORA_VERSION} as config -FROM ${BASE_IMAGE}:${FEDORA_VERSION} + +FROM ${BASE_IMAGE}:${FEDORA_VERSION} as builder ARG FEDORA_VERSION COPY initial_setup.sh /usr/bin/ COPY packages.yaml /tmp/ -COPY --from=docker.io/mikefarah/yq /usr/bin/yq /tmp/ +COPY --from=yq /usr/bin/yq /tmp/ # remove non-flatpak firefox RUN rpm-ostree override remove firefox firefox-langpacks diff --git a/config/Containerfile b/config/Containerfile index ff10f83..8012763 100644 --- a/config/Containerfile +++ b/config/Containerfile @@ -23,5 +23,5 @@ RUN rpmbuild -ba \ /tmp/specs/container-policy.spec && \ cp /tmp/container-policy/rpmbuild/RPMS/noarch/getchoo-container-policy*.rpm /var/cache/rpms/container-policy/ -FROM scratch +FROM scratch as rpms COPY --from=builder /var/cache/rpms/container-policy /rpms/container-policy 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 \ |