fix: Always pull main as source image

We layer the NVIDIA kmod on top of the existing image, no need for the NVIDIA image Signed-off-by: RJ Sampson <[email protected]>
ublue-os · Jul 9, 2024 · 36adfff · 36adfff
1 parent aec00cb
commit 36adfff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Containerfile b/Containerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
-ARG SOURCE_IMAGE="${SOURCE_IMAGE:-${BASE_IMAGE_NAME}-${IMAGE_FLAVOR}}"
+ARG SOURCE_IMAGE="${SOURCE_IMAGE:-${BASE_IMAGE_NAME}-main}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG TARGET_BASE="${TARGET_BASE:-bluefin}"

diff --git a/build_files/base/install-akmods.sh b/build_files/base/install-akmods.sh
@@ -7,7 +7,7 @@ if [[ "${AKMODS_FLAVOR}" == "coreos" ]]; then
  https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-coreos-pool.repo
 fi
 
-# Nvidia for gts/stable - nvidia
+# Nvidia
 if [[ "${AKMODS_FLAVOR}" == "nvidia" ]]; then
  curl -Lo /tmp/nvidia-install.sh https://raw.githubusercontent.com/ublue-os/hwe/main/nvidia-install.sh && \
  chmod +x /tmp/nvidia-install.sh && \