fixup! fixup! src/macros: increase awareness of FROM lines

fixup! src/macros: increase awareness of FROM lines
src/macros: increase awareness of FROM lines
2024-09-26 20:55:11 -04:00 · 2024-09-26 20:54:07 -04:00 · 2024-09-26 20:49:52 -04:00
1 changed files with 14 additions and 4 deletions
--- 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 stagex/.* 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 stagex/.* 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
Author	SHA1	Message	Date
ryan	6c4e8eddcf	fixup! fixup! src/macros: increase awareness of FROM lines	2024-09-26 20:55:11 -04:00
ryan	595c44d078	fixup! src/macros: increase awareness of FROM lines	2024-09-26 20:54:07 -04:00
ryan	044048ebd9	src/macros: increase awareness of FROM lines	2024-09-26 20:49:52 -04:00