Don't use a default variant

tenp

Author: LaurentGoderre

.travis.yml

@@ -87,7 +87,7 @@ jobs:
     - stage: Build
       env:
         - NODE_VERSION: "10"
-        - VARIANT: "default"
+        - VARIANT: "jessie"
 
     - stage: Build
       env:
@@ -107,7 +107,7 @@ jobs:
     - stage: Build
       env:
         - NODE_VERSION: "6"
-        - VARIANT: "default"
+        - VARIANT: "jessie"
 
     - stage: Build
       env:
@@ -132,7 +132,7 @@ jobs:
     - stage: Build
       env:
         - NODE_VERSION: "8"
-        - VARIANT: "default"
+        - VARIANT: "jessie"
 
     - stage: Build
       env:
@@ -157,7 +157,7 @@ jobs:
     - stage: Build
       env:
         - NODE_VERSION: "9"
-        - VARIANT: "default"
+        - VARIANT: "jessie"
 
     - stage: Build
       env:

10/Dockerfile renamed to 10/jessie/Dockerfile

@@ -1,7 +1,7 @@
 bashbrew-arch   variants
-arm32v7  default,onbuild,slim,stretch
-arm64v8  default,onbuild,slim,stretch
-amd64    default,alpine,onbuild,slim,stretch
-i386     default,onbuild,slim,stretch
-ppc64le  default,onbuild,slim,stretch
-s390x    default,onbuild,slim,stretch
+arm32v7  jessie,onbuild,slim,stretch
+arm64v8  jessie,onbuild,slim,stretch
+amd64    jessie,alpine,onbuild,slim,stretch
+i386     jessie,onbuild,slim,stretch
+ppc64le  jessie,onbuild,slim,stretch
+s390x    jessie,onbuild,slim,stretch

6/architectures

@@ -1,8 +1,8 @@
 bashbrew-arch   variants
 arm32v6  alpine
-arm32v7  default,onbuild,slim,stretch
-arm64v8  default,alpine,onbuild,slim,stretch
-amd64    default,alpine,onbuild,slim,stretch
-i386     default,alpine,onbuild,slim,stretch
-ppc64le  default,alpine,onbuild,slim,stretch
-s390x    default,alpine,onbuild,slim,stretch
+arm32v7  jessie,onbuild,slim,stretch
+arm64v8  jessie,alpine,onbuild,slim,stretch
+amd64    jessie,alpine,onbuild,slim,stretch
+i386     jessie,alpine,onbuild,slim,stretch
+ppc64le  jessie,alpine,onbuild,slim,stretch
+s390x    jessie,alpine,onbuild,slim,stretch

6/Dockerfile renamed to 6/jessie/Dockerfile

@@ -1,2 +1,3 @@
 baseuri     https://nodejs.org/dist
+default_variant	jessie
 alpine_version  3.7

8/Dockerfile renamed to 8/jessie/Dockerfile

@@ -145,6 +145,9 @@ function get_versions() {
 
   local versions
   local dirs=("$@")
+
+  local default_variant
+  default_variant=$(get_config "./" "default_variant")
   if [ ${#dirs[@]} -eq 0 ]; then
     IFS=' ' read -ra dirs <<<"$(echo "${prefix%/}/"*/)"
   fi
@@ -156,7 +159,7 @@ function get_versions() {
       for subdir in "${subdirs[@]}"; do
         versions+=("${subdir}")
       done
-    elif [ -a "${dir}/Dockerfile" ]; then
+    elif [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then
       versions+=("${dir#./}")
     fi
   done
@@ -182,7 +185,14 @@ function get_full_version() {
   version=$1
   shift
 
-  grep -m1 'ENV NODE_VERSION ' "${version}/Dockerfile" | cut -d' ' -f3
+  local default_dockerfile
+  if [ -f "${version}/${default_variant}/Dockerfile" ]; then
+    default_dockerfile="${version}/${default_variant}/Dockerfile"
+  else
+    default_dockerfile="${version}/Dockerfile"
+  fi
+
+  grep -m1 'ENV NODE_VERSION ' "${default_dockerfile}" | cut -d' ' -f3
 }
 
 function get_major_minor_version() {