Apply update.sh to 10 series too (removes experimental)

Author: tianon

10-jdk/Dockerfile

@@ -22,8 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
-
 # Default to UTF-8 file.encoding
 ENV LANG C.UTF-8
 

10-jdk/slim/Dockerfile

@@ -22,8 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
-
 # Default to UTF-8 file.encoding
 ENV LANG C.UTF-8
 

10-jre/Dockerfile

@@ -22,8 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
-
 # Default to UTF-8 file.encoding
 ENV LANG C.UTF-8
 

10-jre/slim/Dockerfile

@@ -22,8 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN echo 'deb http://deb.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list
-
 # Default to UTF-8 file.encoding
 ENV LANG C.UTF-8
 

update.sh

@@ -190,15 +190,11 @@ for version in "${versions[@]}"; do
 
 	tilde='~'
 	case "$javaVersion" in
-		10)
+		10|11)
 			# update Debian's "10~39" to "10-ea+39" (matching http://jdk.java.net/10/)
-			fullVersion="${fullVersion//10$tilde/10-ea+}"
-			;;
-		11)
 			# update Debian's "11~8" to "11-ea+8" (matching http://jdk.java.net/11/)
-			fullVersion="${fullVersion//11$tilde/11-ea+}"
+			fullVersion="${fullVersion//$javaVersion$tilde/$javaVersion-ea+}"
 			;;
-
 	esac
 	fullVersion="${fullVersion//$tilde/-}"