bump tomcat, java

Dockerfile

@@ -3,15 +3,16 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 #settings
 ENV JAVA_OPTS='-Xmx3000m'
 ENV TOMCAT_MAJOR_VERSION=9
-ENV TOMCAT_VERSION=9.0.22
+ENV TOMCAT_VERSION=9.0.24
 ENV CATALINA_HOME=c:\\Tomcat
 ENV IDP_VERSION=3.4.4
-ENV TIERVERSION=20190701
+ENV TIERVERSION=20190801
 
 ###
 ##below is for Corretto Java 
-ENV JAVA_HOME='C:\Program Files\Amazon Corretto\jdk1.8.0_212'
-ENV CORRETTO_VERSION='8.212.04.2'
+ENV JAVA_HOME='C:\Program Files\Amazon Corretto\jdk1.8.0_222'
+ENV CORRETTO_VERSION='8.222.10.1'
+ENV CORRETTO_FILE_VERSION='8.222.10.3'
 ##below is for Zulu Java
 #ENV JAVA_HOME='c:\zulujava\zulu-8\'
 #ENV JAVA_INSTALL_FILENAME=zulu8.36.0.1-ca-jdk8.0.202-win_x64.msi
@@ -25,8 +26,8 @@ RUN powershell [Environment]::SetEnvironmentVariable('JAVA_HOME', '%JAVA_HOME%',
 ENV SHIB_INSTALL_FILE=C:\\shibboleth-identity-provider-$IDP_VERSION-x64.msi
 
 ###install Corretto Java 
-RUN powershell (new-object System.Net.WebClient).Downloadfile('https://d3pxv6yz143wms.cloudfront.net/%CORRETTO_VERSION%/amazon-corretto-%CORRETTO_VERSION%-1-windows-x64.msi', 'C:\corretto-java-%CORRETTO_VERSION%')
-RUN powershell If ((Get-FileHash C:\corretto-java-%CORRETTO_VERSION% -Algorithm MD5).Hash.ToLower() -eq 'a030757f394ffdd73018e24e2ec1991f')  { ` \
+RUN powershell (new-object System.Net.WebClient).Downloadfile('https://d3pxv6yz143wms.cloudfront.net/%CORRETTO_VERSION%/amazon-corretto-%CORRETTO_FILE_VERSION%-windows-x64.msi', 'C:\corretto-java-%CORRETTO_VERSION%')
+RUN powershell If ((Get-FileHash C:\corretto-java-%CORRETTO_VERSION% -Algorithm MD5).Hash.ToLower() -eq '29da4f86581537a74a5784ef81d4c5d1')  { ` \
 		start-process -filepath c:\windows\system32\msiexec.exe -passthru -wait -argumentlist '/i','C:\corretto-java-%CORRETTO_VERSION%','/qn' ` \
        } Else { throw 'bad hash comparison on Zulu Java download' }
 RUN del C:\corretto-java-%CORRETTO_VERSION%
@@ -65,7 +66,7 @@ RUN del C:\corretto-java-%CORRETTO_VERSION%
 COPY container_files/config.ini c:\\config.ini
 RUN powershell (new-object System.Net.WebClient).Downloadfile('http://www.apache.org/dist/tomcat/tomcat-%TOMCAT_MAJOR_VERSION%/v%TOMCAT_VERSION%/bin/apache-tomcat-%TOMCAT_VERSION%.exe', 'C:\apache-tomcat-%TOMCAT_VERSION%.exe')
 RUN powershell If ((Get-FileHash C:\apache-tomcat-%TOMCAT_VERSION%.exe -Algorithm SHA512).Hash.ToLower() -eq ` \
- '6c57ebde8f72762729e6ea6d1ccbc2bba4b5fb81f98b9cb1e8a19028828d56263c90b55b8d31bbc52582ef0e90cc00d07f30885122b2fcb27f4f2ad6dcb099f0') ` \
+ '3f3484af82ebd5eab7a7581bb6dbdab4b42ce507cafe17dd7b6aabb0cada4e6b0fbe4b89190d70339e73dd6f69dbd779a3426f41638e52ec587607d1b1a9c4ce') ` \
  { ` \
         start-process -filepath C:\apache-tomcat-%TOMCAT_VERSION%.exe -passthru -wait -argumentlist '/S','/C=c:\config.ini','/D=c:\Tomcat' ` \
       } Else { throw 'bad hash comparison on Tomcat download' }

container_files/config.ini

@@ -1,2 +1,2 @@
-JavaHome=C:/Program Files/Amazon Corretto/jdk1.8.0_212
+JavaHome=C:/Program Files/Amazon Corretto/jdk1.8.0_222