From 92bd4324e50c57fc1779ccc97c61aaa53bc0020d Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 25 Sep 2018 11:04:47 -0700 Subject: [PATCH] Add openjdk jre 11 variants for 8.5 and 9.0; Drop tomcat 8.0 (end-of-life) https://tomcat.apache.org/tomcat-80-eol.html --- .travis.yml | 10 +- 8.0/jre7-alpine/Dockerfile | 135 ------------------- 8.0/jre8-alpine/Dockerfile | 135 ------------------- {8.0/jre8-slim => 8.5/jre11-slim}/Dockerfile | 6 +- {8.0/jre7 => 8.5/jre11}/Dockerfile | 6 +- {8.0/jre8 => 9.0/jre11-slim}/Dockerfile | 10 +- {8.0/jre7-slim => 9.0/jre11}/Dockerfile | 10 +- 7 files changed, 20 insertions(+), 292 deletions(-) delete mode 100644 8.0/jre7-alpine/Dockerfile delete mode 100644 8.0/jre8-alpine/Dockerfile rename {8.0/jre8-slim => 8.5/jre11-slim}/Dockerfile (97%) rename {8.0/jre7 => 8.5/jre11}/Dockerfile (97%) rename {8.0/jre8 => 9.0/jre11-slim}/Dockerfile (91%) rename {8.0/jre7-slim => 9.0/jre11}/Dockerfile (91%) diff --git a/.travis.yml b/.travis.yml index bae4dcd8c..12fd6fe03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,19 +5,17 @@ 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=9.0 VARIANT=jre10-slim - VERSION=9.0 VARIANT=jre10 - 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=8.5 VARIANT=jre10-slim - VERSION=8.5 VARIANT=jre10 - - VERSION=8.0 VARIANT=jre8-slim - - VERSION=8.0 VARIANT=jre8-alpine - - VERSION=8.0 VARIANT=jre8 - - VERSION=8.0 VARIANT=jre7-slim - - VERSION=8.0 VARIANT=jre7-alpine - - VERSION=8.0 VARIANT=jre7 - VERSION=7 VARIANT=jre8-slim - VERSION=7 VARIANT=jre8-alpine - VERSION=7 VARIANT=jre8 diff --git a/8.0/jre7-alpine/Dockerfile b/8.0/jre7-alpine/Dockerfile deleted file mode 100644 index 2fa2e82fd..000000000 --- a/8.0/jre7-alpine/Dockerfile +++ /dev/null @@ -1,135 +0,0 @@ -FROM openjdk:7-jre-alpine - -ENV CATALINA_HOME /usr/local/tomcat -ENV PATH $CATALINA_HOME/bin:$PATH -RUN mkdir -p "$CATALINA_HOME" -WORKDIR $CATALINA_HOME - -# let "Tomcat Native" live somewhere isolated -ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib -ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR - -# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS -# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh) -ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 - -ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.53 -ENV TOMCAT_SHA512 cd8a4e48a629a2f2bb4ce6b101ebcce41da52b506064396ec1b2915c0b0d8d82123091242f2929a649bcd8b65ecf6cd1ab9c7d90ac0e261821097ab6fbe22df9 - -ENV TOMCAT_TGZ_URLS \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \ -# if the version is outdated, we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \ - https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \ - https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz - -ENV TOMCAT_ASC_URLS \ - https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \ -# not all the mirrors actually carry the .asc files :'( - https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \ - https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \ - https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc - -RUN set -eux; \ - \ - apk add --no-cache --virtual .fetch-deps \ - gnupg \ - \ - ca-certificates \ - openssl \ - ; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ - done; \ - \ - success=; \ - for url in $TOMCAT_TGZ_URLS; do \ - if wget -O tomcat.tar.gz "$url"; then \ - success=1; \ - break; \ - fi; \ - done; \ - [ -n "$success" ]; \ - \ - echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \ - \ - success=; \ - for url in $TOMCAT_ASC_URLS; do \ - if wget -O tomcat.tar.gz.asc "$url"; then \ - success=1; \ - break; \ - fi; \ - done; \ - [ -n "$success" ]; \ - \ - gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \ - tar -xvf tomcat.tar.gz --strip-components=1; \ - rm bin/*.bat; \ - rm tomcat.tar.gz*; \ - command -v gpgconf && gpgconf --kill all || :; \ - rm -rf "$GNUPGHOME"; \ - \ - nativeBuildDir="$(mktemp -d)"; \ - tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \ - apk add --no-cache --virtual .native-build-deps \ - apr-dev \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - libc-dev \ - make \ - "openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \ - openssl-dev \ - ; \ - ( \ - export CATALINA_HOME="$PWD"; \ - cd "$nativeBuildDir/native"; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --libdir="$TOMCAT_NATIVE_LIBDIR" \ - --prefix="$CATALINA_HOME" \ - --with-apr="$(which apr-1-config)" \ - --with-java-home="$(docker-java-home)" \ - --with-ssl=yes; \ - make -j "$(nproc)"; \ - make install; \ - ); \ - rm -rf "$nativeBuildDir"; \ - rm bin/tomcat-native.tar.gz; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --virtual .tomcat-native-rundeps $runDeps; \ - apk del .fetch-deps .native-build-deps; \ - \ -# sh removes env vars it doesn't support (ones with periods) -# https://github.com/docker-library/tomcat/issues/77 - apk add --no-cache bash; \ - find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \ - \ -# fix permissions (especially for running as non-root) -# https://github.com/docker-library/tomcat/issues/35 - chmod -R +rX .; \ - chmod 777 logs work - -# verify Tomcat Native is working properly -RUN set -e \ - && nativeLines="$(catalina.sh configtest 2>&1)" \ - && nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \ - && nativeLines="$(echo "$nativeLines" | sort -u)" \ - && if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \ - echo >&2 "$nativeLines"; \ - exit 1; \ - fi - -EXPOSE 8080 -CMD ["catalina.sh", "run"] diff --git a/8.0/jre8-alpine/Dockerfile b/8.0/jre8-alpine/Dockerfile deleted file mode 100644 index d450ad952..000000000 --- a/8.0/jre8-alpine/Dockerfile +++ /dev/null @@ -1,135 +0,0 @@ -FROM openjdk:8-jre-alpine - -ENV CATALINA_HOME /usr/local/tomcat -ENV PATH $CATALINA_HOME/bin:$PATH -RUN mkdir -p "$CATALINA_HOME" -WORKDIR $CATALINA_HOME - -# let "Tomcat Native" live somewhere isolated -ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib -ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR - -# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS -# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh) -ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 - -ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.53 -ENV TOMCAT_SHA512 cd8a4e48a629a2f2bb4ce6b101ebcce41da52b506064396ec1b2915c0b0d8d82123091242f2929a649bcd8b65ecf6cd1ab9c7d90ac0e261821097ab6fbe22df9 - -ENV TOMCAT_TGZ_URLS \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \ -# if the version is outdated, we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \ - https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \ - https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz - -ENV TOMCAT_ASC_URLS \ - https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \ -# not all the mirrors actually carry the .asc files :'( - https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \ - https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \ - https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc - -RUN set -eux; \ - \ - apk add --no-cache --virtual .fetch-deps \ - gnupg \ - \ - ca-certificates \ - openssl \ - ; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ - done; \ - \ - success=; \ - for url in $TOMCAT_TGZ_URLS; do \ - if wget -O tomcat.tar.gz "$url"; then \ - success=1; \ - break; \ - fi; \ - done; \ - [ -n "$success" ]; \ - \ - echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \ - \ - success=; \ - for url in $TOMCAT_ASC_URLS; do \ - if wget -O tomcat.tar.gz.asc "$url"; then \ - success=1; \ - break; \ - fi; \ - done; \ - [ -n "$success" ]; \ - \ - gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \ - tar -xvf tomcat.tar.gz --strip-components=1; \ - rm bin/*.bat; \ - rm tomcat.tar.gz*; \ - command -v gpgconf && gpgconf --kill all || :; \ - rm -rf "$GNUPGHOME"; \ - \ - nativeBuildDir="$(mktemp -d)"; \ - tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \ - apk add --no-cache --virtual .native-build-deps \ - apr-dev \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - libc-dev \ - make \ - "openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \ - openssl-dev \ - ; \ - ( \ - export CATALINA_HOME="$PWD"; \ - cd "$nativeBuildDir/native"; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --libdir="$TOMCAT_NATIVE_LIBDIR" \ - --prefix="$CATALINA_HOME" \ - --with-apr="$(which apr-1-config)" \ - --with-java-home="$(docker-java-home)" \ - --with-ssl=yes; \ - make -j "$(nproc)"; \ - make install; \ - ); \ - rm -rf "$nativeBuildDir"; \ - rm bin/tomcat-native.tar.gz; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --virtual .tomcat-native-rundeps $runDeps; \ - apk del .fetch-deps .native-build-deps; \ - \ -# sh removes env vars it doesn't support (ones with periods) -# https://github.com/docker-library/tomcat/issues/77 - apk add --no-cache bash; \ - find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \ - \ -# fix permissions (especially for running as non-root) -# https://github.com/docker-library/tomcat/issues/35 - chmod -R +rX .; \ - chmod 777 logs work - -# verify Tomcat Native is working properly -RUN set -e \ - && nativeLines="$(catalina.sh configtest 2>&1)" \ - && nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \ - && nativeLines="$(echo "$nativeLines" | sort -u)" \ - && if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \ - echo >&2 "$nativeLines"; \ - exit 1; \ - fi - -EXPOSE 8080 -CMD ["catalina.sh", "run"] diff --git a/8.0/jre8-slim/Dockerfile b/8.5/jre11-slim/Dockerfile similarity index 97% rename from 8.0/jre8-slim/Dockerfile rename to 8.5/jre11-slim/Dockerfile index 013c2d56b..5ce9f066c 100644 --- a/8.0/jre8-slim/Dockerfile +++ b/8.5/jre11-slim/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-slim +FROM openjdk:11-jre-slim ENV CATALINA_HOME /usr/local/tomcat ENV PATH $CATALINA_HOME/bin:$PATH @@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.53 -ENV TOMCAT_SHA512 cd8a4e48a629a2f2bb4ce6b101ebcce41da52b506064396ec1b2915c0b0d8d82123091242f2929a649bcd8b65ecf6cd1ab9c7d90ac0e261821097ab6fbe22df9 +ENV TOMCAT_VERSION 8.5.34 +ENV TOMCAT_SHA512 131dfe23918f33fb24cefa7a03286c786304151f95f7bc0b6e34dfb6b0d1e65fe606e48b85c60c8a522938d1a01a36b540e69c94f36973321858e229731cda82 ENV TOMCAT_TGZ_URLS \ # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 diff --git a/8.0/jre7/Dockerfile b/8.5/jre11/Dockerfile similarity index 97% rename from 8.0/jre7/Dockerfile rename to 8.5/jre11/Dockerfile index c04aa379f..b8a76a900 100644 --- a/8.0/jre7/Dockerfile +++ b/8.5/jre11/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:7-jre +FROM openjdk:11-jre ENV CATALINA_HOME /usr/local/tomcat ENV PATH $CATALINA_HOME/bin:$PATH @@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.53 -ENV TOMCAT_SHA512 cd8a4e48a629a2f2bb4ce6b101ebcce41da52b506064396ec1b2915c0b0d8d82123091242f2929a649bcd8b65ecf6cd1ab9c7d90ac0e261821097ab6fbe22df9 +ENV TOMCAT_VERSION 8.5.34 +ENV TOMCAT_SHA512 131dfe23918f33fb24cefa7a03286c786304151f95f7bc0b6e34dfb6b0d1e65fe606e48b85c60c8a522938d1a01a36b540e69c94f36973321858e229731cda82 ENV TOMCAT_TGZ_URLS \ # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 diff --git a/8.0/jre8/Dockerfile b/9.0/jre11-slim/Dockerfile similarity index 91% rename from 8.0/jre8/Dockerfile rename to 9.0/jre11-slim/Dockerfile index 41f4c0689..583234184 100644 --- a/8.0/jre8/Dockerfile +++ b/9.0/jre11-slim/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre +FROM openjdk:11-jre-slim ENV CATALINA_HOME /usr/local/tomcat ENV PATH $CATALINA_HOME/bin:$PATH @@ -49,11 +49,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS # see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh) -ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 +ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 -ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.53 -ENV TOMCAT_SHA512 cd8a4e48a629a2f2bb4ce6b101ebcce41da52b506064396ec1b2915c0b0d8d82123091242f2929a649bcd8b65ecf6cd1ab9c7d90ac0e261821097ab6fbe22df9 +ENV TOMCAT_MAJOR 9 +ENV TOMCAT_VERSION 9.0.12 +ENV TOMCAT_SHA512 f03bdfcc85a5fc0cd4f5cbb4c7d1e7b8b48014383e47d9a92c6e974adcb0cbf8ce0f3620fee2cd267b0c46f7238c3431847cb86076283ae252ab91260e8bf569 ENV TOMCAT_TGZ_URLS \ # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 diff --git a/8.0/jre7-slim/Dockerfile b/9.0/jre11/Dockerfile similarity index 91% rename from 8.0/jre7-slim/Dockerfile rename to 9.0/jre11/Dockerfile index eda3c9cb2..e167b80d6 100644 --- a/8.0/jre7-slim/Dockerfile +++ b/9.0/jre11/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:7-jre-slim +FROM openjdk:11-jre ENV CATALINA_HOME /usr/local/tomcat ENV PATH $CATALINA_HOME/bin:$PATH @@ -49,11 +49,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS # see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh) -ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 +ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 -ENV TOMCAT_MAJOR 8 -ENV TOMCAT_VERSION 8.0.53 -ENV TOMCAT_SHA512 cd8a4e48a629a2f2bb4ce6b101ebcce41da52b506064396ec1b2915c0b0d8d82123091242f2929a649bcd8b65ecf6cd1ab9c7d90ac0e261821097ab6fbe22df9 +ENV TOMCAT_MAJOR 9 +ENV TOMCAT_VERSION 9.0.12 +ENV TOMCAT_SHA512 f03bdfcc85a5fc0cd4f5cbb4c7d1e7b8b48014383e47d9a92c6e974adcb0cbf8ce0f3620fee2cd267b0c46f7238c3431847cb86076283ae252ab91260e8bf569 ENV TOMCAT_TGZ_URLS \ # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394