From f941101d4d706cea27fab3b628c19e870a78d194 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 7 Nov 2017 21:28:08 -0500 Subject: [PATCH] Use only major version for directory names --- .travis.yml | 8 ++++---- {4.8 => 4}/Dockerfile | 0 {4.8 => 4}/alpine/Dockerfile | 0 {4.8 => 4}/architectures | 0 {4.8 => 4}/onbuild/Dockerfile | 0 {4.8 => 4}/slim/Dockerfile | 0 {4.8 => 4}/stretch/Dockerfile | 0 {4.8 => 4}/wheezy/Dockerfile | 0 {6.12 => 6}/Dockerfile | 0 {6.12 => 6}/alpine/Dockerfile | 0 {6.12 => 6}/architectures | 0 {6.12 => 6}/onbuild/Dockerfile | 0 {6.12 => 6}/slim/Dockerfile | 0 {6.12 => 6}/stretch/Dockerfile | 0 {6.12 => 6}/wheezy/Dockerfile | 0 {8.9 => 8}/Dockerfile | 0 {8.9 => 8}/alpine/Dockerfile | 0 {8.9 => 8}/onbuild/Dockerfile | 0 {8.9 => 8}/slim/Dockerfile | 0 {8.9 => 8}/stretch/Dockerfile | 0 {8.9 => 8}/wheezy/Dockerfile | 0 {9.1 => 9}/Dockerfile | 0 {9.1 => 9}/alpine/Dockerfile | 0 {9.1 => 9}/onbuild/Dockerfile | 0 {9.1 => 9}/slim/Dockerfile | 0 {9.1 => 9}/stretch/Dockerfile | 0 {9.1 => 9}/wheezy/Dockerfile | 0 generate-stackbrew-library.sh | 13 +++++++------ update.sh | 2 +- 29 files changed, 12 insertions(+), 11 deletions(-) rename {4.8 => 4}/Dockerfile (100%) rename {4.8 => 4}/alpine/Dockerfile (100%) rename {4.8 => 4}/architectures (100%) rename {4.8 => 4}/onbuild/Dockerfile (100%) rename {4.8 => 4}/slim/Dockerfile (100%) rename {4.8 => 4}/stretch/Dockerfile (100%) rename {4.8 => 4}/wheezy/Dockerfile (100%) rename {6.12 => 6}/Dockerfile (100%) rename {6.12 => 6}/alpine/Dockerfile (100%) rename {6.12 => 6}/architectures (100%) rename {6.12 => 6}/onbuild/Dockerfile (100%) rename {6.12 => 6}/slim/Dockerfile (100%) rename {6.12 => 6}/stretch/Dockerfile (100%) rename {6.12 => 6}/wheezy/Dockerfile (100%) rename {8.9 => 8}/Dockerfile (100%) rename {8.9 => 8}/alpine/Dockerfile (100%) rename {8.9 => 8}/onbuild/Dockerfile (100%) rename {8.9 => 8}/slim/Dockerfile (100%) rename {8.9 => 8}/stretch/Dockerfile (100%) rename {8.9 => 8}/wheezy/Dockerfile (100%) rename {9.1 => 9}/Dockerfile (100%) rename {9.1 => 9}/alpine/Dockerfile (100%) rename {9.1 => 9}/onbuild/Dockerfile (100%) rename {9.1 => 9}/slim/Dockerfile (100%) rename {9.1 => 9}/stretch/Dockerfile (100%) rename {9.1 => 9}/wheezy/Dockerfile (100%) diff --git a/.travis.yml b/.travis.yml index 168eb4aad1..5ba13aea57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ script: env: - DOCTOCCHECK: true - - NODE_VERSION: '4.*' - - NODE_VERSION: '6.*' - - NODE_VERSION: '8.*' - - NODE_VERSION: '9.*' + - NODE_VERSION: '4' + - NODE_VERSION: '6' + - NODE_VERSION: '8' + - NODE_VERSION: '9' matrix: include: diff --git a/4.8/Dockerfile b/4/Dockerfile similarity index 100% rename from 4.8/Dockerfile rename to 4/Dockerfile diff --git a/4.8/alpine/Dockerfile b/4/alpine/Dockerfile similarity index 100% rename from 4.8/alpine/Dockerfile rename to 4/alpine/Dockerfile diff --git a/4.8/architectures b/4/architectures similarity index 100% rename from 4.8/architectures rename to 4/architectures diff --git a/4.8/onbuild/Dockerfile b/4/onbuild/Dockerfile similarity index 100% rename from 4.8/onbuild/Dockerfile rename to 4/onbuild/Dockerfile diff --git a/4.8/slim/Dockerfile b/4/slim/Dockerfile similarity index 100% rename from 4.8/slim/Dockerfile rename to 4/slim/Dockerfile diff --git a/4.8/stretch/Dockerfile b/4/stretch/Dockerfile similarity index 100% rename from 4.8/stretch/Dockerfile rename to 4/stretch/Dockerfile diff --git a/4.8/wheezy/Dockerfile b/4/wheezy/Dockerfile similarity index 100% rename from 4.8/wheezy/Dockerfile rename to 4/wheezy/Dockerfile diff --git a/6.12/Dockerfile b/6/Dockerfile similarity index 100% rename from 6.12/Dockerfile rename to 6/Dockerfile diff --git a/6.12/alpine/Dockerfile b/6/alpine/Dockerfile similarity index 100% rename from 6.12/alpine/Dockerfile rename to 6/alpine/Dockerfile diff --git a/6.12/architectures b/6/architectures similarity index 100% rename from 6.12/architectures rename to 6/architectures diff --git a/6.12/onbuild/Dockerfile b/6/onbuild/Dockerfile similarity index 100% rename from 6.12/onbuild/Dockerfile rename to 6/onbuild/Dockerfile diff --git a/6.12/slim/Dockerfile b/6/slim/Dockerfile similarity index 100% rename from 6.12/slim/Dockerfile rename to 6/slim/Dockerfile diff --git a/6.12/stretch/Dockerfile b/6/stretch/Dockerfile similarity index 100% rename from 6.12/stretch/Dockerfile rename to 6/stretch/Dockerfile diff --git a/6.12/wheezy/Dockerfile b/6/wheezy/Dockerfile similarity index 100% rename from 6.12/wheezy/Dockerfile rename to 6/wheezy/Dockerfile diff --git a/8.9/Dockerfile b/8/Dockerfile similarity index 100% rename from 8.9/Dockerfile rename to 8/Dockerfile diff --git a/8.9/alpine/Dockerfile b/8/alpine/Dockerfile similarity index 100% rename from 8.9/alpine/Dockerfile rename to 8/alpine/Dockerfile diff --git a/8.9/onbuild/Dockerfile b/8/onbuild/Dockerfile similarity index 100% rename from 8.9/onbuild/Dockerfile rename to 8/onbuild/Dockerfile diff --git a/8.9/slim/Dockerfile b/8/slim/Dockerfile similarity index 100% rename from 8.9/slim/Dockerfile rename to 8/slim/Dockerfile diff --git a/8.9/stretch/Dockerfile b/8/stretch/Dockerfile similarity index 100% rename from 8.9/stretch/Dockerfile rename to 8/stretch/Dockerfile diff --git a/8.9/wheezy/Dockerfile b/8/wheezy/Dockerfile similarity index 100% rename from 8.9/wheezy/Dockerfile rename to 8/wheezy/Dockerfile diff --git a/9.1/Dockerfile b/9/Dockerfile similarity index 100% rename from 9.1/Dockerfile rename to 9/Dockerfile diff --git a/9.1/alpine/Dockerfile b/9/alpine/Dockerfile similarity index 100% rename from 9.1/alpine/Dockerfile rename to 9/alpine/Dockerfile diff --git a/9.1/onbuild/Dockerfile b/9/onbuild/Dockerfile similarity index 100% rename from 9.1/onbuild/Dockerfile rename to 9/onbuild/Dockerfile diff --git a/9.1/slim/Dockerfile b/9/slim/Dockerfile similarity index 100% rename from 9.1/slim/Dockerfile rename to 9/slim/Dockerfile diff --git a/9.1/stretch/Dockerfile b/9/stretch/Dockerfile similarity index 100% rename from 9.1/stretch/Dockerfile rename to 9/stretch/Dockerfile diff --git a/9.1/wheezy/Dockerfile b/9/wheezy/Dockerfile similarity index 100% rename from 9.1/wheezy/Dockerfile rename to 9/wheezy/Dockerfile diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 393eac9fa2..0d74039c01 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -6,13 +6,13 @@ hash git 2>/dev/null || { echo >&2 "git not found, exiting."; } # Used dynamically: print "$array_" $1 # shellcheck disable=SC2034 -array_4_8='4 argon'; +array_4='4 argon'; # shellcheck disable=SC2034 -array_6_12='6 boron'; +array_6='6 boron'; # shellcheck disable=SC2034 -array_8_9='8 carbon'; +array_8='8 carbon'; # shellcheck disable=SC2034 -array_9_1='9 latest'; +array_9='9 latest'; cd "$(cd "${0%/*}" && pwd -P)"; @@ -47,11 +47,12 @@ for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories [ -f "$version/Dockerfile" ] || continue - eval stub="$(echo "$version" | awk -F. '{ print "$array_" $1 "_" $2 }')"; + eval stub="$(echo "$version" | awk -F. '{ print "$array_" $1 }')"; commit="$(fileCommit "$version")" fullVersion="$(grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)" + minorVersion="$(echo "$fullVersion" | cut -d'.' -f2)" - versionAliases=( $fullVersion $version ${stub} ) + versionAliases=( $fullVersion $version.$minorVersion ${stub} ) # Get supported architectures for a specific version. See details in function.sh supportedArches=( $(get_supported_arches "$version" "default") ) diff --git a/update.sh b/update.sh index 9a569c412c..83622ee93b 100755 --- a/update.sh +++ b/update.sh @@ -31,7 +31,7 @@ function update_node_version { shift fi - fullVersion="$(curl -sSL --compressed 'https://nodejs.org/dist' | grep '