Refactor to mirror upstream "support tracks" (and add the still-upstream-supported 4.9 series back)

[tianon]

From https://gcc.gnu.org/:

News

• GCC 6.2 released [2016-08-22]
• GCC 4.9.4 released [2016-08-03]
• GCC 5.4 released [2016-06-03]
• GCC 6.1 released [2016-04-27]
• GCC 5.3 released [2015-12-04]
• GCC 5.2 released [2015-07-16]
• GCC 4.9.3 released [2015-06-26]
• GCC 4.8.5 released [2015-06-23]
• GCC 5.1 released [2015-04-22]

Note that the 5 and 6 series only get a minor bump, no patch bumps.

[tianon]

commit 8c7687860cdd4ef9227c249ca4587984e2636a55
Author: Tianon Gravi <admwiggin@gmail.com>
Date:   Fri Sep 16 13:48:23 2016 -0700

    Refactor to mirror upstream "support tracks" (and add the still-upstream-supported 4.9 series back)

diff --git a/.travis.yml b/.travis.yml
index 20a8995..d3208fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,9 @@ language: bash
 services: docker

 env:
-  - VERSION=6.1
-  - VERSION=5.3
+  - VERSION=6
+  - VERSION=5
+  - VERSION=4.9

 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/5.3/Dockerfile b/4.9/Dockerfile
similarity index 96%
copy from 5.3/Dockerfile
copy to 4.9/Dockerfile
index 46068c0..474c452 100644
--- a/5.3/Dockerfile
+++ b/4.9/Dockerfile
@@ -13,9 +13,9 @@ RUN set -xe \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    done

-# Last Modified: 2015-12-04
-ENV GCC_VERSION 5.3.0
-# Docker EOL: 2016-12-04
+# Last Modified: 2016-08-03
+ENV GCC_VERSION 4.9.4
+# Docker EOL: 2017-08-03

 # "download_prerequisites" pulls down a bunch of tarballs and extracts them,
 # but then leaves the tarballs themselves lying around
diff --git a/6.1/Dockerfile b/5/Dockerfile
similarity index 96%
rename from 6.1/Dockerfile
rename to 5/Dockerfile
index e2169b2..bb1e247 100644
--- a/6.1/Dockerfile
+++ b/5/Dockerfile
@@ -13,9 +13,9 @@ RUN set -xe \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    done

-# Last Modified: 2016-04-27
-ENV GCC_VERSION 6.1.0
-# Docker EOL: 2017-04-27
+# Last Modified: 2016-06-03
+ENV GCC_VERSION 5.4.0
+# Docker EOL: 2017-06-03

 # "download_prerequisites" pulls down a bunch of tarballs and extracts them,
 # but then leaves the tarballs themselves lying around
diff --git a/5.3/Dockerfile b/6/Dockerfile
similarity index 96%
rename from 5.3/Dockerfile
rename to 6/Dockerfile
index 46068c0..59ef5e9 100644
--- a/5.3/Dockerfile
+++ b/6/Dockerfile
@@ -13,9 +13,9 @@ RUN set -xe \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    done

-# Last Modified: 2015-12-04
-ENV GCC_VERSION 5.3.0
-# Docker EOL: 2016-12-04
+# Last Modified: 2016-08-22
+ENV GCC_VERSION 6.2.0
+# Docker EOL: 2017-08-22

 # "download_prerequisites" pulls down a bunch of tarballs and extracts them,
 # but then leaves the tarballs themselves lying around
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 1c67832..77d405b 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -3,8 +3,7 @@ set -e

 declare -A aliases=(
    [4.9]='4'
-   [5.3]='5'
-   [6.1]='6 latest'
+   [6]='latest'
 )

 self="$(basename "$BASH_SOURCE")"
@@ -56,12 +55,16 @@ for version in "${versions[@]}"; do
    dockerfile="$(git show "$commit":"$version/Dockerfile")"
    fullVersion="$(echo "$dockerfile" | awk '$1 == "ENV" && $2 == "GCC_VERSION" { print $3; exit }')"

-   versionAliases=(
-       $fullVersion
+   versionAliases=()
+   while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
+       versionAliases+=( $fullVersion )
+       fullVersion="${fullVersion%[.-]*}"
+   done
+   versionAliases+=(
        $version
        ${aliases[$version]:-}
    )
-   
+
    echo
    echo "$dockerfile" | grep -m1 '^# Last Modified: '
    cat <<-EOE

[tianon]

$ ./update.sh
+ sed -ri '
            s/^(ENV GCC_VERSION) .*/\1 4.9.4/;
            s/^(# Last Modified:) .*/\1 2016-08-03/;
            s/^(# Docker EOL:) .*/\1 2017-08-03/;
        ' 4.9/Dockerfile
+ sed -ri '
            s/^(ENV GCC_VERSION) .*/\1 5.4.0/;
            s/^(# Last Modified:) .*/\1 2016-06-03/;
            s/^(# Docker EOL:) .*/\1 2017-06-03/;
        ' 5/Dockerfile
+ sed -ri '
            s/^(ENV GCC_VERSION) .*/\1 6.2.0/;
            s/^(# Last Modified:) .*/\1 2016-08-22/;
            s/^(# Docker EOL:) .*/\1 2017-08-22/;
        ' 6/Dockerfile

$ ./generate-stackbrew-library.sh
# this file is generated via https://github.com/docker-library/gcc/blob/8c7687860cdd4ef9227c249ca4587984e2636a55/generate-stackbrew-library.sh

Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
             Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/gcc.git

# Last Modified: 2016-08-03
Tags: 4.9.4, 4.9, 4
GitCommit: 8c7687860cdd4ef9227c249ca4587984e2636a55
Directory: 4.9
# Docker EOL: 2017-08-03

# Last Modified: 2016-06-03
Tags: 5.4.0, 5.4, 5
GitCommit: 8c7687860cdd4ef9227c249ca4587984e2636a55
Directory: 5
# Docker EOL: 2017-06-03

# Last Modified: 2016-08-22
Tags: 6.2.0, 6.2, 6, latest
GitCommit: 8c7687860cdd4ef9227c249ca4587984e2636a55
Directory: 6
# Docker EOL: 2017-08-22

[tianon]

$ diff -u <(bashbrew cat gcc) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63  2016-09-16 13:54:10.869152257 -0700
+++ /dev/fd/62  2016-09-16 13:54:10.869152257 -0700
@@ -1,10 +1,14 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/gcc.git

-Tags: 5.3.0, 5.3, 5
-GitCommit: df055b1ba29bd666470f4735f2a7bab9acffd0b3
-Directory: 5.3
+Tags: 4.9.4, 4.9, 4
+GitCommit: 8c7687860cdd4ef9227c249ca4587984e2636a55
+Directory: 4.9

-Tags: 6.1.0, 6.1, 6, latest
-GitCommit: d9c8446748f7d69626f2e9425376a6672fff09af
-Directory: 6.1
+Tags: 5.4.0, 5.4, 5
+GitCommit: 8c7687860cdd4ef9227c249ca4587984e2636a55
+Directory: 5
+
+Tags: 6.2.0, 6.2, 6, latest
+GitCommit: 8c7687860cdd4ef9227c249ca4587984e2636a55
+Directory: 6

[tianon]

cc @yosifkit

[yosifkit]

🎈