From 3826a14fd6355f22c9512cb9404d43e5cd3b9aca Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Fri, 10 Apr 2026 18:23:55 -0400
Subject: [PATCH] Use env var substitution

---
 recipes/base-combo-nvidia.yml   | 5 ++---
 recipes/base-combo.yml          | 5 ++---
 recipes/base-cosmic-nvidia.yml  | 5 ++---
 recipes/base-cosmic.yml         | 5 ++---
 recipes/base-kinoite-nvidia.yml | 5 ++---
 recipes/base-kinoite.yml        | 5 ++---
 recipes/base-nvidia.yml         | 5 ++---
 recipes/base.yml                | 5 ++---
 recipes/cp-laptop.yml           | 3 +--
 recipes/jp-desktop-nvidia.yml   | 3 +--
 recipes/jp-laptop.yml           | 3 +--
 recipes/pg-desktop-nvidia.yml   | 3 +--
 recipes/wke-fw-desktop.yml      | 3 +--
 recipes/wke-server.yml          | 3 +--
 recipes/wke-worker.yml          | 3 +--
 15 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/recipes/base-combo-nvidia.yml b/recipes/base-combo-nvidia.yml
index 47f28c5..3b356b1 100644
--- a/recipes/base-combo-nvidia.yml
+++ b/recipes/base-combo-nvidia.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: combo-nvidia
-base-image: quay.io/fedora-ostree-desktops/kinoite
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC and Plasma for Nvidia
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base-combo.yml b/recipes/base-combo.yml
index 0750ab8..ce83674 100644
--- a/recipes/base-combo.yml
+++ b/recipes/base-combo.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: combo
-base-image: quay.io/fedora-ostree-desktops/kinoite
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC and Plasma
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base-cosmic-nvidia.yml b/recipes/base-cosmic-nvidia.yml
index a9f4b84..c787e62 100644
--- a/recipes/base-cosmic-nvidia.yml
+++ b/recipes/base-cosmic-nvidia.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cosmic-nvidia
-base-image: quay.io/fedora-ostree-desktops/base-atomic
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC for Nvidia
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base-cosmic.yml b/recipes/base-cosmic.yml
index 609de49..2659fdf 100644
--- a/recipes/base-cosmic.yml
+++ b/recipes/base-cosmic.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cosmic
-base-image: quay.io/fedora-ostree-desktops/base-atomic
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base-kinoite-nvidia.yml b/recipes/base-kinoite-nvidia.yml
index f376593..cfd00e5 100644
--- a/recipes/base-kinoite-nvidia.yml
+++ b/recipes/base-kinoite-nvidia.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite-nvidia
-base-image: quay.io/fedora-ostree-desktops/kinoite
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with Plasma for Nvidia
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base-kinoite.yml b/recipes/base-kinoite.yml
index 584d30b..1cc501d 100644
--- a/recipes/base-kinoite.yml
+++ b/recipes/base-kinoite.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite
-base-image: quay.io/fedora-ostree-desktops/kinoite
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with Plasma
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base-nvidia.yml b/recipes/base-nvidia.yml
index eaa77bb..73a227f 100644
--- a/recipes/base-nvidia.yml
+++ b/recipes/base-nvidia.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: base-nvidia
-base-image: quay.io/fedora-ostree-desktops/base-atomic
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS
 modules:
   - from-file: base/common.yml
diff --git a/recipes/base.yml b/recipes/base.yml
index 88ea17d..b3b3cbe 100644
--- a/recipes/base.yml
+++ b/recipes/base.yml
@@ -1,9 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: base
-base-image: quay.io/fedora-ostree-desktops/base-atomic
-# base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
-image-version: 43
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS
 modules:
   - from-file: base/common.yml
diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml
index bef8686..60b6582 100644
--- a/recipes/cp-laptop.yml
+++ b/recipes/cp-laptop.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cp-laptop
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/kinoite
-# base-image: harbor.jpnet.dev/wunker-os/kinoite
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/kinoite
 image-version: latest
 description: The image of Wunker OS for CP's laptop.
 modules:
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 341fe8b..80cdd0a 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-desktop-nvidia
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo-nvidia
-# base-image: harbor.jpnet.dev/wunker-os/combo-nvidia
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/combo-nvidia
 image-version: latest
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index e119803..ce34424 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-laptop
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo
-# base-image: harbor.jpnet.dev/wunker-os/combo
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/combo
 image-version: latest
 description: The image of Wunker OS for JP's Laptop.
 # stages:
diff --git a/recipes/pg-desktop-nvidia.yml b/recipes/pg-desktop-nvidia.yml
index 4eb0f66..7c5bde7 100644
--- a/recipes/pg-desktop-nvidia.yml
+++ b/recipes/pg-desktop-nvidia.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: pg-desktop-nvidia
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/kinoite-nvidia
-# base-image: harbor.jpnet.dev/wunker-os/kinoite-nvidia
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/kinoite-nvidia
 image-version: latest
 description: The image of Wunker OS for PG's desktop gaming.
 modules:
diff --git a/recipes/wke-fw-desktop.yml b/recipes/wke-fw-desktop.yml
index 5ab80ca..ee3214e 100644
--- a/recipes/wke-fw-desktop.yml
+++ b/recipes/wke-fw-desktop.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/base
-# base-image: harbor.jpnet.dev/wunker-os/base
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/base
 image-version: latest
 description: The image of Wunker OS for RKE2 Worker
 alt-tags:
diff --git a/recipes/wke-server.yml b/recipes/wke-server.yml
index 2653ad6..e911496 100644
--- a/recipes/wke-server.yml
+++ b/recipes/wke-server.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/base
-# base-image: harbor.jpnet.dev/wunker-os/base
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/base
 image-version: latest
 description: The image of Wunker OS for RKE2 Server
 alt-tags:
diff --git a/recipes/wke-worker.yml b/recipes/wke-worker.yml
index 89cb73e..a449fba 100644
--- a/recipes/wke-worker.yml
+++ b/recipes/wke-worker.yml
@@ -1,8 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/base
-# base-image: harbor.jpnet.dev/wunker-os/base
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/base
 image-version: latest
 description: The image of Wunker OS for RKE2 Worker
 alt-tags: