merge latest

Dockerfile

@@ -6,22 +6,24 @@ FROM microsoft/windowsservercore:latest
 #ENV JAVA_INSTALL_FOLDER=jre1.8.0_171
 ENV JAVA_OPTS='-Xmx3000m'
 ENV TOMCAT_MAJOR_VERSION=9
-ENV TOMCAT_VERSION=9.0.14
+
+ENV TOMCAT_VERSION=9.0.16
+
 ENV CATALINA_HOME=c:\\Tomcat
 ENV IDP_VERSION=3.4.3
 ###
 #ENV JAVA_INSTALL_CLI_STRING=INSTALLDIR=c:\\Java\\$JAVA_INSTALL_FOLDER
 #below is for Zulu Java
 ENV JAVA_HOME='c:\zulujava\zulu-8\'
-ENV JAVA_INSTALL_FILENAME=zulu8.33.0.1-jdk8.0.192-win_x64.msi
+ENV JAVA_INSTALL_FILENAME=zulu8.36.0.1-ca-jdk8.0.202-win_x64.msi
 #below is for Oracle Java
 #ENV JAVA_HOME=c:\\Java\\$JAVA_INSTALL_FOLDER
 RUN powershell [Environment]::SetEnvironmentVariable('JAVA_HOME', '%JAVA_HOME%', [System.EnvironmentVariableTarget]::Machine )
 ENV SHIB_INSTALL_FILE=C:\\shibboleth-identity-provider-$IDP_VERSION-x64.msi
 
 ###install Zulu Java
 RUN powershell (new-object System.Net.WebClient).Downloadfile('https://cdn.azul.com/zulu/bin/%JAVA_INSTALL_FILENAME%', 'C:\%JAVA_INSTALL_FILENAME%')
-RUN powershell If ((Get-FileHash C:\%JAVA_INSTALL_FILENAME% -Algorithm MD5).Hash.ToLower() -eq 'e5017fb5b959e935ab8d9e8b46c66fbd')  { ` \
+RUN powershell If ((Get-FileHash C:\%JAVA_INSTALL_FILENAME% -Algorithm MD5).Hash.ToLower() -eq 'cf7825107dd71cd9a6455c2855838966')  { ` \
 		start-process -filepath c:\windows\system32\msiexec.exe -passthru -wait -argumentlist '/i','C:\%JAVA_INSTALL_FILENAME%','APPLICATIONROOTDIRECTORY=c:\zulujava','/qn' ` \
        } Else { throw 'bad hash comparison on Zulu Java download' }
 RUN del C:\%JAVA_INSTALL_FILENAME%
@@ -54,7 +56,7 @@ RUN del C:\%JAVA_INSTALL_FILENAME%
 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 ` \
- 'f63a744afda1e333b6ef2894d7b60a95a6fa2adeafecfeeb6335297bd10dba7066ede3ca1b4d8738fef3745341c93399de8d7282b76e5840356f9cc0f2b34b38') ` \
+ 'ffa45a8a084725c51b8ccd5bc4d115f1eef0590cdce2d2868b666f5285d7347e2ee400cd22c87d091d326f66d70f88deb9765a886b3dfa0b699c8f119859369f') ` \
  { ` \
         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' }
@@ -74,6 +76,10 @@ RUN powershell If ((Get-FileHash C:\shibboleth-identity-provider-%IDP_VERSION%-x
        } Else { throw 'bad hash comparison on IdP download' }
 RUN del C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi
 
+##add JSTL
+ADD https://build.shibboleth.net/nexus/service/local/repositories/thirdparty/content/javax/servlet/jstl/1.2/jstl-1.2.jar c:\\opt\\shibboleth-idp\\edit-webapp\\WEB-INF\\lib\\jstl-1.2.jar
+RUN C:/opt/shibboleth-idp/bin/build.bat -noinput -S -q -Didp.target.dir=c:/opt/shibboleth-idp
+
 #link IdP's war file to Tomcat
 RUN mklink c:\Tomcat\webapps\idp.war c:\opt\shibboleth-idp\war\idp.war
 

Jenkinsfile

@@ -112,6 +112,6 @@ def imagename() {
 def handleError(String message){
   echo "${message}"
   currentBuild.setResult("FAILED")
-  slackSend color: 'danger', message: "${message}"
+  slackSend color: 'danger', message: "${message} (<${env.BUILD_URL}|Open>)"
   bat exit 1
 }

test-compose/compose.ps1

@@ -0,0 +1,2 @@
+docker-compose up --build -d
+

test-compose/decompose.ps1

@@ -0,0 +1,3 @@
+docker-compose kill
+docker-compose rm
+

test-compose/idp/Dockerfile

@@ -1,4 +1,4 @@
-FROM tier/shibbidp_novm_windows:latest
+FROM tier/shib-idp-windows:latest
 
 #params for supplying your IdP config to your container (can be overridden at build-time using build-args)
 ARG TOMCFG=config\\tomcat