From 38318777b01654c29d95ab293b6353196ef0eb7f Mon Sep 17 00:00:00 2001
From: Leigh <351529+leighmcculloch@users.noreply.github.com>
Date: Tue, 29 Sep 2026 03:46:22 +0000
Subject: [PATCH] resolve image inherits in Makefile

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ef059cfc..6ea9a6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ CONTAINER_RUNTIME?=docker
 REVISION=$(shell git -c core.abbrev=no describe --always --exclude='*' --long --dirty)
 TAG?=latest
 
-# Process images.json through the images-with-extras script
+# Process images.json through the images-resolve-inherits and images-with-extras scripts
 IMAGE_JSON=.image.json
-.image.json: images.json .scripts/images-with-extras
-	< images.json jq '.[] | select(.tag == "$(TAG)") | [ . ]' | .scripts/images-with-extras | jq '.[]' > $@
+.image.json: images.json .scripts/images-resolve-inherits .scripts/images-with-extras
+	< images.json .scripts/images-resolve-inherits | jq '.[] | select(.tag == "$(TAG)") | [ . ]' | .scripts/images-with-extras | jq '.[]' > $@
 
 # Extract configuration from selected image
 XDR_REPO =          $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "xdr") | .repo')