Update for updated OpenJDK base images

.travis.yml

@@ -2,22 +2,16 @@ language: bash
 services: docker
 
 env:
-  - VERSION=9.0 VARIANT=jre8-slim
-  - VERSION=9.0 VARIANT=jre8-alpine
-  - VERSION=9.0 VARIANT=jre8
-  - VERSION=9.0 VARIANT=jre11-slim
-  - VERSION=9.0 VARIANT=jre11
-  - VERSION=8.5 VARIANT=jre8-slim
-  - VERSION=8.5 VARIANT=jre8-alpine
-  - VERSION=8.5 VARIANT=jre8
-  - VERSION=8.5 VARIANT=jre11-slim
-  - VERSION=8.5 VARIANT=jre11
-  - VERSION=7 VARIANT=jre8-slim
-  - VERSION=7 VARIANT=jre8-alpine
-  - VERSION=7 VARIANT=jre8
-  - VERSION=7 VARIANT=jre7-slim
-  - VERSION=7 VARIANT=jre7-alpine
-  - VERSION=7 VARIANT=jre7
+  - VERSION=9.0 VARIANT=jdk8-slim
+  - VERSION=9.0 VARIANT=jdk8
+  - VERSION=9.0 VARIANT=jdk11-slim
+  - VERSION=9.0 VARIANT=jdk11
+  - VERSION=8.5 VARIANT=jdk8-slim
+  - VERSION=8.5 VARIANT=jdk8
+  - VERSION=8.5 VARIANT=jdk11-slim
+  - VERSION=8.5 VARIANT=jdk11
+  - VERSION=7 VARIANT=jdk8-slim
+  - VERSION=7 VARIANT=jdk8
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

7/jre7-slim/Dockerfile → 7/jdk8-slim/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:7-jre-slim
+FROM openjdk:8-jdk-slim
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 # and https://github.com/docker-library/tomcat/pull/31
 ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
 RUN set -ex; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends openssl; \
 	currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
 	if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
 		if ! grep -q stretch /etc/apt/sources.list; then \
@@ -119,7 +121,6 @@ RUN set -eux; \
 		libapr1-dev \
 		libssl-dev \
 		make \
-		"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
 	; \
 	( \
 		export CATALINA_HOME="$PWD"; \

7/jre8-slim/Dockerfile → 7/jdk8/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-slim
+FROM openjdk:8-jdk
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 # and https://github.com/docker-library/tomcat/pull/31
 ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
 RUN set -ex; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends openssl; \
 	currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
 	if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
 		if ! grep -q stretch /etc/apt/sources.list; then \
@@ -119,7 +121,6 @@ RUN set -eux; \
 		libapr1-dev \
 		libssl-dev \
 		make \
-		"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
 	; \
 	( \
 		export CATALINA_HOME="$PWD"; \