From 8732e104d9f8b2fdc3af11057f536d71116bc5da Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 23 Sep 2019 21:32:56 +0000 Subject: [PATCH] bump IdP to 3.4.5 and Tomcat to 9.0.26 --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 070fc54..4b8a230 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 #settings ENV JAVA_OPTS='-Xmx3000m' ENV TOMCAT_MAJOR_VERSION=9 -ENV TOMCAT_VERSION=9.0.24 +ENV TOMCAT_VERSION=9.0.26 ENV CATALINA_HOME=c:\\Tomcat -ENV IDP_VERSION=3.4.4 -ENV TIERVERSION=20190801 +ENV IDP_VERSION=3.4.5 +ENV TIERVERSION=20190901 ### ##below are settings for Corretto Java @@ -66,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 ` \ - '3f3484af82ebd5eab7a7581bb6dbdab4b42ce507cafe17dd7b6aabb0cada4e6b0fbe4b89190d70339e73dd6f69dbd779a3426f41638e52ec587607d1b1a9c4ce') ` \ + 'c8c3db4c72266264716835622d8cbbf182ac37b48e8222cd15571c8ce91bf11adc24fec2814fa2d084947d0e5b551c9badf159243c0f063694d1a72bbce16d93') ` \ { ` \ 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' } @@ -81,7 +81,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 -Algorithm SHA1).Hash.ToLower() -eq '821fdb7c178a247059142f8fbd6d7a895057e2fe') { ` \ +RUN powershell If ((Get-FileHash C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi -Algorithm SHA1).Hash.ToLower() -eq '711dfbe3a4fddafdee4e8e1db49bac83c587fd4d') { ` \ 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