Merge pull request #167 from infosiftr/openjdk-6

Remove OpenJDK 6

Author: tianon

.travis.yml

@@ -22,10 +22,6 @@ env:
   - VERSION=7-jdk
   - VERSION=7-jdk VARIANT=slim
   - VERSION=7-jdk VARIANT=alpine
-  - VERSION=6-jre
-  - VERSION=6-jre VARIANT=slim
-  - VERSION=6-jdk
-  - VERSION=6-jdk VARIANT=slim
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

6-jdk/Dockerfile

@@ -122,9 +122,9 @@ aliases() {
 }
 
 for version in "${versions[@]}"; do
-	javaVersion="$version" # "6-jdk"
+	javaVersion="$version" # "7-jdk"
 	javaType="${javaVersion##*-}" # "jdk"
-	javaVersion="${javaVersion%-$javaType}" # "6"
+	javaVersion="${javaVersion%-$javaType}" # "7"
 
 	for v in \
 		'' slim alpine \

6-jdk/slim/Dockerfile

@@ -14,7 +14,6 @@ IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -V) ); unset IFS
 
 declare -A suites=(
 	# FROM buildpack-deps:SUITE-xxx
-	[6]='wheezy'
 	[7]='jessie'
 	[8]='stretch'
 	[9]='sid'
@@ -167,9 +166,9 @@ template-contribute-footer() {
 travisEnv=
 appveyorEnv=
 for version in "${versions[@]}"; do
-	javaVersion="$version" # "6-jdk"
+	javaVersion="$version" # "7-jdk"
 	javaType="${javaVersion##*-}" # "jdk"
-	javaVersion="${javaVersion%-*}" # "6"
+	javaVersion="${javaVersion%-*}" # "7"
 
 	suite="${suites[$javaVersion]}"
 	addSuite="${addSuites[$javaVersion]}"