From 54ee1265cdf602f9907caaf45c233ef3e2e8f533 Mon Sep 17 00:00:00 2001
From: Christopher Horrell <christopher@horrell.ca>
Date: Thu, 29 Sep 2016 09:16:18 -0400
Subject: [PATCH 1/2] Improvements to skip "docs" and other non-docker
 directories

---
 test-build.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test-build.sh b/test-build.sh
index 7c689d3fe8..bfecfa7075 100755
--- a/test-build.sh
+++ b/test-build.sh
@@ -25,9 +25,8 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
-  if [[ "$version" == "docs" ]]; then
-    continue
-  fi
+  # Skip "docs" and other non-docker directories
+  [ -f "$version/Dockerfile" ] || continue
 
   tag=$(cat $version/Dockerfile | grep "ENV NODE_VERSION" | cut -d' ' -f3)
 
@@ -50,6 +49,9 @@ for version in "${versions[@]}"; do
   variants=$(ls -d $version/*/ | awk -F"/" '{print $2}')
 
   for variant in $variants; do
+    # Skip non-docker directories
+    [ -f "$version/$variant/Dockerfile" ] || continue
+    
     info "Building $tag-$variant variant..."
     docker build -t node:$tag-$variant $version/$variant
 

From 1b99bb91e895e87af48085b183610a2d8b35195b Mon Sep 17 00:00:00 2001
From: Christopher Horrell <christopher@horrell.ca>
Date: Thu, 29 Sep 2016 09:35:47 -0400
Subject: [PATCH 2/2] Better approach to establishing variants

---
 test-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-build.sh b/test-build.sh
index bfecfa7075..0158f6320a 100755
--- a/test-build.sh
+++ b/test-build.sh
@@ -46,7 +46,7 @@ for version in "${versions[@]}"; do
     info "Test of $tag succeeded."
   fi
 
-  variants=$(ls -d $version/*/ | awk -F"/" '{print $2}')
+  variants=$(echo $version/*/ | xargs -n1 basename)
 
   for variant in $variants; do
     # Skip non-docker directories