From 293f84d20a4468197d5ce75d1d5ae44fdbc9c15a Mon Sep 17 00:00:00 2001
From: Marcel Sackermann <marcel.sackermann@balticminds.de>
Date: Thu, 18 Jul 2024 09:38:46 +0200
Subject: [PATCH] feat(ci): honor `env.IMAGE_REGISTRY` in Containerfile

---
 .github/workflows/reusable-build.yml | 1 +
 Containerfile                        | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 68c31a91..54dd018a 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -194,6 +194,7 @@ jobs:
             FEDORA_MAJOR_VERSION=${{ matrix.fedora_version }}
             RPMFUSION_MIRROR=${{ vars.RPMFUSION_MIRROR }}
             KERNEL_VERSION=${{ env.KERNEL_VERSION }}
+            IMAGE_REGISTRY=${{ env.IMAGE_REGISTRY }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false
 
diff --git a/Containerfile b/Containerfile
index 73ea353c..a15bb0c6 100644
--- a/Containerfile
+++ b/Containerfile
@@ -4,10 +4,11 @@ ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}"
 ARG BASE_IMAGE="quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}"
+ARG IMAGE_REGISTRY=ghcr.io/ublue-os
 
-FROM ghcr.io/ublue-os/config:latest AS config
-FROM ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} AS akmods
-FROM ghcr.io/ublue-os/main-kernel:${KERNEL_VERSION} AS kernel
+FROM ${IMAGE_REGISTRY}/config:latest AS config
+FROM ${IMAGE_REGISTRY}/akmods:main-${FEDORA_MAJOR_VERSION} AS akmods
+FROM ${IMAGE_REGISTRY}/main-kernel:${KERNEL_VERSION} AS kernel
 
 FROM scratch AS ctx
 COPY / /