Merge pull request #118 from zerda/master

Update alpine 3.5 to 3.6 for java 8 & java version from 8u121 to 8u131

Author: tianon

7-jdk/alpine/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.6
 
 # A few problems with compiling Java from source:
 #  1. Oracle.  Licensing prevents us from redistributing the official JDK.
@@ -26,8 +26,8 @@ RUN { \
 ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk
 ENV PATH $PATH:/usr/lib/jvm/java-1.7-openjdk/jre/bin:/usr/lib/jvm/java-1.7-openjdk/bin
 
-ENV JAVA_VERSION 7u121
-ENV JAVA_ALPINE_VERSION 7.121.2.6.8-r0
+ENV JAVA_VERSION 7u131
+ENV JAVA_ALPINE_VERSION 7.131.2.6.9-r1
 
 RUN set -x \
 	&& apk add --no-cache \

7-jre/alpine/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.6
 
 # A few problems with compiling Java from source:
 #  1. Oracle.  Licensing prevents us from redistributing the official JDK.
@@ -26,8 +26,8 @@ RUN { \
 ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk/jre
 ENV PATH $PATH:/usr/lib/jvm/java-1.7-openjdk/jre/bin:/usr/lib/jvm/java-1.7-openjdk/bin
 
-ENV JAVA_VERSION 7u121
-ENV JAVA_ALPINE_VERSION 7.121.2.6.8-r0
+ENV JAVA_VERSION 7u131
+ENV JAVA_ALPINE_VERSION 7.131.2.6.9-r1
 
 RUN set -x \
 	&& apk add --no-cache \

8-jdk/alpine/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.6
 
 # A few problems with compiling Java from source:
 #  1. Oracle.  Licensing prevents us from redistributing the official JDK.
@@ -26,8 +26,8 @@ RUN { \
 ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
 
-ENV JAVA_VERSION 8u121
-ENV JAVA_ALPINE_VERSION 8.121.13-r0
+ENV JAVA_VERSION 8u131
+ENV JAVA_ALPINE_VERSION 8.131.11-r1
 
 RUN set -x \
 	&& apk add --no-cache \

8-jre/alpine/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.6
 
 # A few problems with compiling Java from source:
 #  1. Oracle.  Licensing prevents us from redistributing the official JDK.
@@ -26,8 +26,8 @@ RUN { \
 ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
 ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
 
-ENV JAVA_VERSION 8u121
-ENV JAVA_ALPINE_VERSION 8.121.13-r0
+ENV JAVA_VERSION 8u131
+ENV JAVA_ALPINE_VERSION 8.131.11-r1
 
 RUN set -x \
 	&& apk add --no-cache \

update.sh

@@ -16,9 +16,9 @@ declare -A suites=(
 	[9]='sid'
 )
 declare -A alpineVersions=(
-	[7]='3.4'
-	[8]='3.5'
-	[9]='3.5'
+	[7]='3.6'
+	[8]='3.6'
+	#[9]='TBD' # there is no openjdk9 in Alpine yet (https://pkgs.alpinelinux.org/packages?name=openjdk9*&arch=x86_64)
 )
 
 declare -A addSuites=(