Merge pull request #210 from Pitel/patch-1

Alpine 3.8
docker-library · Jul 9, 2018 · 2ac2312 · 2ac2312
2 parents ca586ef + 1778c73
commit 2ac2312
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/7/jdk/alpine/Dockerfile b/7/jdk/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 # A few reasons for installing distribution-provided OpenJDK:
 #

diff --git a/7/jre/alpine/Dockerfile b/7/jre/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 # A few reasons for installing distribution-provided OpenJDK:
 #

diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 # A few reasons for installing distribution-provided OpenJDK:
 #

diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 # A few reasons for installing distribution-provided OpenJDK:
 #

diff --git a/update.sh b/update.sh
@@ -19,10 +19,10 @@ declare -A suites=(
 	[10]='sid'
 	[11]='sid'
 )
+defaultAlpineVersion='3.8'
 declare -A alpineVersions=(
-	[7]='3.7'
-	[8]='3.7'
-	#[10]='TBD' # there is no openjdk10 in Alpine yet (https://pkgs.alpinelinux.org/packages?name=openjdk10*&arch=x86_64)
+	#[8]='3.7'
+	#[10]='TBD' # there is no openjdk10 in Alpine yet (https://pkgs.alpinelinux.org/packages?name=openjdk*-jre&arch=x86_64)
 )
 
 declare -A addSuites=(
@@ -310,7 +310,7 @@ EOD
 		template-contribute-footer >> "$dir/Dockerfile"
 
 		if [ -d "$dir/alpine" ]; then
-			alpineVersion="${alpineVersions[$javaVersion]}"
+			alpineVersion="${alpineVersions[$javaVersion]:-$defaultAlpineVersion}"
 			alpinePackage="openjdk$javaVersion"
 			alpineJavaHome="/usr/lib/jvm/java-1.${javaVersion}-openjdk"
 			alpinePathAdd="$alpineJavaHome/jre/bin:$alpineJavaHome/bin"