From 044048ebd9e409f1fb768fe6140f6b3da0491f4d Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Thu, 26 Sep 2024 20:48:36 -0400
Subject: [PATCH 1/3] src/macros: increase awareness of FROM lines

---
 src/macros.mk | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/macros.mk b/src/macros.mk
index 1a01498..73c8db6 100644
--- a/src/macros.mk
+++ b/src/macros.mk
@@ -40,8 +40,13 @@ endef
 
 define dep-list
 	$(eval PACKAGE := $(1))
-	grep -Ri "^COPY --from=stagex/" packages/$(PACKAGE)/Containerfile \
-	| sed -e 's/COPY --from=stagex\/\([a-z0-9._-]\+\) .*/\1/g' \
+	grep -Ri \
+		-e "^COPY --from=stagex/"
+		-e "FROM .* AS package" \
+		packages/$(PACKAGE)/Containerfile \
+	| sed \
+		-e 's/COPY --from=stagex\/\([^ ]\+\) .*/\1/g' \
+		-e 's/FROM stagex\/\([^ ]\+\).*/\1/g'
 	| uniq \
 	| while IFS= read -r package; \
 		do \
@@ -61,8 +66,13 @@ endef
 
 define build-context-args
 	$(eval PACKAGE := $(1))
-	grep -Ri "^COPY --from=stagex/" packages/$(PACKAGE)/Containerfile \
-	| sed -e 's/COPY --from=stagex\/\([a-z0-9._-]\+\) .*/\1/g' \
+	grep -Ri \
+		-e "^COPY --from=stagex/"
+		-e "FROM .* AS package" \
+		packages/$(PACKAGE)/Containerfile \
+	| sed \
+		-e 's/COPY --from=stagex\/\([^ ]\+\) .*/\1/g' \
+		-e 's/FROM stagex\/\([^ ]\+\).*/\1/g'
 	| uniq \
 	| while IFS= read -r package; do \
 		if [ "$$package" = "$(PACKAGE)" ]; then

From 595c44d0780650141d2c09427f4d2180380db1e6 Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Thu, 26 Sep 2024 20:54:07 -0400
Subject: [PATCH 2/3] fixup! src/macros: increase awareness of FROM lines

---
 src/macros.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/macros.mk b/src/macros.mk
index 73c8db6..bc11a35 100644
--- a/src/macros.mk
+++ b/src/macros.mk
@@ -68,7 +68,7 @@ define build-context-args
 	$(eval PACKAGE := $(1))
 	grep -Ri \
 		-e "^COPY --from=stagex/"
-		-e "FROM .* AS package" \
+		-e "FROM stagex/.* AS package" \
 		packages/$(PACKAGE)/Containerfile \
 	| sed \
 		-e 's/COPY --from=stagex\/\([^ ]\+\) .*/\1/g' \

From 6c4e8eddcf3c46e5ff1d8fe95232453c28ece492 Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Thu, 26 Sep 2024 20:55:11 -0400
Subject: [PATCH 3/3] fixup! fixup! src/macros: increase awareness of FROM
 lines

---
 src/macros.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/macros.mk b/src/macros.mk
index bc11a35..47840cf 100644
--- a/src/macros.mk
+++ b/src/macros.mk
@@ -42,7 +42,7 @@ define dep-list
 	$(eval PACKAGE := $(1))
 	grep -Ri \
 		-e "^COPY --from=stagex/"
-		-e "FROM .* AS package" \
+		-e "FROM stagex/.* AS package" \
 		packages/$(PACKAGE)/Containerfile \
 	| sed \
 		-e 's/COPY --from=stagex\/\([^ ]\+\) .*/\1/g' \