Merge branch 'testing'

This commit is contained in:
Kyle Gospodnetich 2024-07-17 09:28:35 -07:00
commit ef06e73126

View File

@ -10,9 +10,9 @@ ARG JUPITER_KERNEL_VERSION="${JUPITER_KERNEL_VERSION:-jupiter-20240605.1}"
ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}" ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}"
ARG CODE_NAME="${CODE_NAME:-Holographic}" ARG CODE_NAME="${CODE_NAME:-Holographic}"
FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-20240716 AS akmods
FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods-extra FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-20240716 AS akmods-extra
FROM ghcr.io/ublue-os/fsync-kernel:${FEDORA_MAJOR_VERSION} AS fsync FROM ghcr.io/ublue-os/fsync-kernel:${FEDORA_MAJOR_VERSION}-6.9.8 AS fsync
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
@ -788,7 +788,7 @@ RUN /usr/libexec/containerbuild/image-info && \
systemctl disable batterylimit.service && \ systemctl disable batterylimit.service && \
ostree container commit ostree container commit
FROM ghcr.io/ublue-os/akmods-nvidia:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS nvidia-akmods FROM ghcr.io/ublue-os/akmods-nvidia:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-20240716 AS nvidia-akmods
FROM bazzite AS bazzite-nvidia FROM bazzite AS bazzite-nvidia