From f9f129c1258d51d7813559e504bdf72255abc8cd Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 2 Nov 2017 13:47:42 -0500 Subject: [PATCH] Update Dockerfile --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95ff822..f875381 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM microsoft/windowsservercore:latest #settings -ENV JAVA_VERSION=8u144 -ENV JAVA_BUNDLE_ID=225355_090f390dda5b47b9b721c7dfaa008135 -ENV JAVA_INSTALL_FOLDER=jre1.8.0_144 +ENV JAVA_VERSION=8u151 +ENV JAVA_BUNDLE_ID=227552_e758a0de34e24606bca991d704f6dcbf +ENV JAVA_INSTALL_FOLDER=jre1.8.0_151 ENV JAVA_OPTS=-XX:+UseG1GC\ -Xmx2000m ENV TOMCAT_MAJOR_VERSION=8 -ENV TOMCAT_VERSION=8.0.45 +ENV TOMCAT_VERSION=8.0.47 ENV CATALINA_HOME=c:\\Tomcat -ENV IDP_VERSION=3.3.1.1 +ENV IDP_VERSION=3.3.2.0 ### ENV JAVA_INSTALL_CLI_STRING=INSTALLDIR=c:\\Java\\$JAVA_INSTALL_FOLDER ENV JAVA_HOME=c:\\Java\\$JAVA_INSTALL_FOLDER @@ -17,7 +17,7 @@ ENV SHIB_INSTALL_FILE=C:\\shibboleth-identity-provider-$IDP_VERSION-x64.msi ##install Java RUN powershell (new-object System.Net.WebClient).Downloadfile('http://javadl.oracle.com/webapps/download/AutoDL?BundleId=%JAVA_BUNDLE_ID%', 'C:\jre-%JAVA_VERSION%-windows-x64.exe') -RUN powershell If ((Get-FileHash C:\jre-%JAVA_VERSION%-windows-x64.exe).Hash -eq '1CB458C9B8F4EBC91227EC2F685DC6F0078C5CCE6B00C39382707DCF0606B415') { ` \ +RUN powershell If ((Get-FileHash C:\jre-%JAVA_VERSION%-windows-x64.exe).Hash.ToLower() -eq '4378d712c510930d066bfa256b24e07dfea5ed31aa514afb7c7dd72fcce9bb68') { ` \ start-process -filepath C:\jre-%JAVA_VERSION%-windows-x64.exe -passthru -wait -argumentlist '/s',%JAVA_INSTALL_CLI_STRING%,'/L','installj64.log' ` \ } Else { throw 'bad hash comparison on Java download' } RUN del C:\jre-%JAVA_VERSION%-windows-x64.exe @@ -39,7 +39,7 @@ RUN del c:\jce_policy-8.zip ##install Tomcat 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 SHA1).Hash.ToLower() -eq 'd8823cd37db43981f6a66ca3cbff8cf863ac7cff') { ` \ +RUN powershell If ((Get-FileHash C:\apache-tomcat-%TOMCAT_VERSION%.exe -Algorithm SHA1).Hash.ToLower() -eq '51d81b52d595a4d575bbe89ef4fa137e9367a080') { ` \ start-process -filepath C:\apache-tomcat-%TOMCAT_VERSION%.exe -passthru -wait -argumentlist "/S,/D=C:\Tomcat" ` \ } Else { throw 'bad hash comparison on Tomcat download' } RUN del C:\apache-tomcat-%TOMCAT_VERSION%.exe @@ -53,7 +53,7 @@ RUN rmdir /S /Q c:\Tomcat\webapps\docs && rmdir /S /Q c:\Tomcat\webapps\manager ##install Shibb RUN powershell (new-object System.Net.WebClient).Downloadfile('https://shibboleth.net/downloads/identity-provider/latest/shibboleth-identity-provider-%IDP_VERSION%-x64.msi', 'C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi') -RUN powershell If ((Get-FileHash C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi).Hash -eq '7ffca419cb4b8a891d455b71f48f86ba7999204e683dec8aec4a5c0a3fb48346') { ` \ +RUN powershell If ((Get-FileHash C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi -Algorithm SHA1).Hash.ToLower() -eq 'fca024981da85a77c8389563d584230593f5d399') { ` \ start-process -filepath c:\windows\system32\msiexec.exe -passthru -wait -argumentlist '/i','C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi','/qn','INSTALLDIR=c:\opt\shibboleth-idp','NO_FIREWALL_EXCEPTION=true','DNSNAME=shibboleth.example.org','IDP_SCOPE=example.org' ` \ } Else { throw 'bad hash comparison on IdP download' } RUN del C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi