Adjust base image exclusion in generate-stackbrew-library.sh

tianon · tianon · commit fa41e210db87 · 2019-02-04T15:28:50.000-08:00
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -43,7 +43,7 @@ getArches() {
 
 	eval "declare -g -A parentRepoToArches=( $(
 		find -name 'Dockerfile' -exec awk '
-				toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ {
+				toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ {
 					print "'"$officialImagesUrl"'" $2
 				}
 			' '{}' + \

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ getArches() {`
`43`	`43`
`44`	`44`	`eval "declare -g -A parentRepoToArches=( $(`
`45`	`45`	`find -name 'Dockerfile' -exec awk '`
`46`		`- toupper($1) == "FROM" && $2 !~ /^('"$repo"'\|scratch\|microsoft\/[^:]+)(:\|$)/ {`
	`46`	`+ toupper($1) == "FROM" && $2 !~ /^('"$repo"'\|scratch\|.\/.)(:\|$)/ {`
`47`	`47`	`print "'"$officialImagesUrl"'" $2`
`48`	`48`	`}`
`49`	`49`	`' '{}' + \`