Skip to content
Permalink
Browse files

bump java to 8-232 and tomcat to 9.0.27

  • Loading branch information
pcaskey committed Oct 17, 2019
1 parent 744515a commit d8bfecbee490961849dbcee0e4ee3683961a8190
Showing with 11 additions and 9 deletions.
  1. +10 −8 Dockerfile
  2. +1 −1 container_files/config.ini
@@ -3,16 +3,18 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
#settings
ENV JAVA_OPTS='-Xmx3000m'
ENV TOMCAT_MAJOR_VERSION=9
ENV TOMCAT_VERSION=9.0.26
ENV TOMCAT_VERSION=9.0.27
ENV CATALINA_HOME=c:\\Tomcat
ENV IDP_VERSION=3.4.6
ENV TIERVERSION=20191001
ENV TIERVERSION=20191002

###
### JAVA ###
#
##below are settings for Corretto Java
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'
ENV JAVA_HOME='C:\Program Files\Amazon Corretto\jdk1.8.0_232'
ENV CORRETTO_VERSION='8.232.09.1'
ENV CORRETTO_FILE_VERSION='8.232.09.1'

##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
@@ -27,7 +29,7 @@ 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_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') { ` \
RUN powershell If ((Get-FileHash C:\corretto-java-%CORRETTO_VERSION% -Algorithm MD5).Hash.ToLower() -eq '620ee139aac5f05ab404006b5e33378f') { ` \
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%
@@ -66,7 +68,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 ` \
'c8c3db4c72266264716835622d8cbbf182ac37b48e8222cd15571c8ce91bf11adc24fec2814fa2d084947d0e5b551c9badf159243c0f063694d1a72bbce16d93') ` \
'b7d19fb71336e8d3d78e63b770d675dc5e429b98c29e6b1c38d7642ad2b111558885c996f8a209391f8cbf72fed1d782c884f1cd1d58c41542af8e2efc7a0f67') ` \
{ ` \
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' }
@@ -1,2 +1,2 @@
JavaHome=C:/Program Files/Amazon Corretto/jdk1.8.0_222
JavaHome=C:/Program Files/Amazon Corretto/jdk1.8.0_232

0 comments on commit d8bfecb

Please sign in to comment.
You can’t perform that action at this time.