From d66d7a04ae95b928494fe4c1d0c0b2b0e8492d05 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 26 Nov 2018 22:41:10 +0000 Subject: [PATCH 1/8] add JSTL --- Dockerfile | 3 +++ test-compose/compose.ps1 | 2 ++ test-compose/decompose.ps1 | 3 +++ test-compose/idp/debug | Bin 2344 -> 0 bytes 4 files changed, 8 insertions(+) create mode 100644 test-compose/compose.ps1 create mode 100644 test-compose/decompose.ps1 delete mode 100644 test-compose/idp/debug diff --git a/Dockerfile b/Dockerfile index ba139d1..c7ca4ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,6 +74,9 @@ 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 + #link IdP's war file to Tomcat RUN mklink c:\Tomcat\webapps\idp.war c:\opt\shibboleth-idp\war\idp.war diff --git a/test-compose/compose.ps1 b/test-compose/compose.ps1 new file mode 100644 index 0000000..8a3d011 --- /dev/null +++ b/test-compose/compose.ps1 @@ -0,0 +1,2 @@ +docker-compose up --build -d + diff --git a/test-compose/decompose.ps1 b/test-compose/decompose.ps1 new file mode 100644 index 0000000..886e197 --- /dev/null +++ b/test-compose/decompose.ps1 @@ -0,0 +1,3 @@ +docker-compose kill +docker-compose rm + diff --git a/test-compose/idp/debug b/test-compose/idp/debug deleted file mode 100644 index 638671a5cca10bf918344d8c4b5dcb8336826aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2344 zcmb`J;cwDF7{=evCjJlo;8%1lEd>%y=1??onb}ajm@Lp1B*Iw69RBs{@3{^~3u~}h zF75S>>%G4|_uPB@`F&+e^DN4m%P@lrA2zeB-T=Tn6^nkl(U9R_bZfA_t+%rZpIN!@W&kSmFr^Jjd|#d3WHb zPT=d?>-+VZ5PNFhDAHj;uVR;@et~PFrA8!tO|~;CL4zZUA&OY-CeI;kX^E{_!S)G4 zvCUzb67y-ed}w?WiyV1Colt@jS6IPyV(-v!;8eTe%e4yf`ivRpPsSO*7~qf?Le&|R zK57=d7FBQ#O-1fIbF^z5wZ?x-O5Ifrp~|>A6zvP2mimfRt-Vwi_JRHKnBz8kqJfUu zxmxW!i%i_?+rB@{fgx)7DA$B>%$xzFW7I6N#+9t+taXnJq8;+sT9?V|?U&g3C}p3t z(Nm7}-R>#Uwkv4A+DB-I_q57Z5Bs^yD0S~pTKRQVQ{NGKhInA)I1}zE5zE=9Q$Z|k zhjwhADZ4pnAG3Db4EHwR)~b$hN}lEa-yaiHj?r3I8*XK%n7*RoJ}a`F&o}uqck?M~ z_YYQl0rQHIpMrID57>Jxl$KYT@XF=N!)5N`IaKEE9jLgNb&hMdtFGtnHiVi%D;7Z? zIq$?f%=^!(TEbY1ouY@MOy GZ1xwnD^ybe From d3531c39351f8db890ed33809de9e08a1fb71415 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 26 Nov 2018 22:52:56 +0000 Subject: [PATCH 2/8] fix notification in Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 51d6e20..4c4745c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -95,7 +95,7 @@ node('windows') { stage 'Notify' - //slackSend color: 'good', message: "$maintainer/$imagename:$tag pushed to DockerHub" + slackSend color: 'good', message: "$maintainer/$imagename:$tag pushed to DockerHub" } @@ -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}" bat exit 1 } From d632f87672a8c4a042765360e2aafdfc73791259 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 26 Nov 2018 23:33:36 +0000 Subject: [PATCH 3/8] add rebuild for idp --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c7ca4ba..dd1bf41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,6 +76,7 @@ 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 From 6717f027620a401ff2324eb9106a75b8d4e5df97 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 26 Nov 2018 23:40:07 +0000 Subject: [PATCH 4/8] fix test idp Dockerfile --- test-compose/idp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile index cfd158c..c27cfe1 100644 --- a/test-compose/idp/Dockerfile +++ b/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 From 3fa3121f7dd26ec351c0f3e6cf39ceb10f50d9f9 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 19 Dec 2018 16:43:46 +0000 Subject: [PATCH 5/8] bump java, tomcat, and shib to current --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd1bf41..25822f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,14 +6,14 @@ 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.12 +ENV TOMCAT_VERSION=9.0.14 ENV CATALINA_HOME=c:\\Tomcat -ENV IDP_VERSION=3.4.1 +ENV IDP_VERSION=3.4.2.1 ### #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.31.0.1-jdk8.0.181-win_x64.msi +ENV JAVA_INSTALL_FILENAME=zulu8.33.0.1-jdk8.0.192-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 ) @@ -21,7 +21,7 @@ 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 '21088dfd884ca42b999a1c2e890ac086') { ` \ +RUN powershell If ((Get-FileHash C:\%JAVA_INSTALL_FILENAME% -Algorithm MD5).Hash.ToLower() -eq 'e5017fb5b959e935ab8d9e8b46c66fbd') { ` \ 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 +54,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 ` \ - 'a03c507179cddb8ec6d35572fa81522c3472df689e34718daff8faa91bcb6af397a5f0d0d4c929add3e86d0957275c0d402ea96c491c50f639ec6371ba146d43') ` \ + 'f63a744afda1e333b6ef2894d7b60a95a6fa2adeafecfeeb6335297bd10dba7066ede3ca1b4d8738fef3745341c93399de8d7282b76e5840356f9cc0f2b34b38') ` \ { ` \ 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' } @@ -69,7 +69,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 'cdb716c6b50de9862697e34ce1f69d7b563b802b') { ` \ +RUN powershell If ((Get-FileHash C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi -Algorithm SHA1).Hash.ToLower() -eq '24b0c308c82cd8e4a708b456263756504b2e322f') { ` \ 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 From 4acc6f64a96d2f264d336be067e8356873d69f78 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 14 Jan 2019 16:11:38 -0600 Subject: [PATCH 6/8] bump idp --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25822f7..6e9b787 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV JAVA_OPTS='-Xmx3000m' ENV TOMCAT_MAJOR_VERSION=9 ENV TOMCAT_VERSION=9.0.14 ENV CATALINA_HOME=c:\\Tomcat -ENV IDP_VERSION=3.4.2.1 +ENV IDP_VERSION=3.4.3 ### #ENV JAVA_INSTALL_CLI_STRING=INSTALLDIR=c:\\Java\\$JAVA_INSTALL_FOLDER #below is for Zulu Java @@ -51,7 +51,7 @@ RUN del C:\%JAVA_INSTALL_FILENAME% ##install Tomcat -COPY container_files/config.ini c:\config.ini +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') ` \ @@ -88,7 +88,7 @@ COPY container_files/sendtierbeacon.ps1 c:\\util #schedule script to run (at random time) #RUN powershell ($tm=((Get-Random -Minimum 0 -Maximum 4) -as [string]) + ":" + ((Get-Random -Minimum 0 -Maximum 60) -as [string]) ; start-process -filepath schtasks -passthru -wait -argumentlist '/create','/tn','\"Send TIER Beacon\"','/tr','c:\util\sendtierbeacon.ps1','/sc','DAILY','/st',"$tm" #The line above is triggering an apprent bug in docker or windows core (essentially invalid XML), the 2 lines below are the workaround -COPY container_files/TIER_Beacon_Task.xml c:\TIER_Beacon_Task.xml +COPY container_files/TIER_Beacon_Task.xml c:\\TIER_Beacon_Task.xml RUN powershell schtasks /Create /XML c:\TIER_Beacon_Task.xml /TN 'TIER Beacon' ; $tm=((Get-Random -Minimum 0 -Maximum 4) -as [string]).padleft(2,'0') + ':' + ((Get-Random -Minimum 0 -Maximum 60) -as [string]).padleft(2,'0') ; schtasks /Change /TN 'TIER Beacon' /ST $tm RUN del c:\TIER_Beacon_Task.xml From bebd9c99dd2dde0d23834030ba0b0aca25e704e2 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 14 Jan 2019 16:13:50 -0600 Subject: [PATCH 7/8] correct hash --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e9b787..866b635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,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 '24b0c308c82cd8e4a708b456263756504b2e322f') { ` \ +RUN powershell If ((Get-FileHash C:\shibboleth-identity-provider-%IDP_VERSION%-x64.msi -Algorithm SHA1).Hash.ToLower() -eq '68b85b7d301a34e68b45724d978f71d0093e48ca') { ` \ 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 From 83d49d145bfaa146a12e682e4e936f6fb3d9820f Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 12 Feb 2019 20:14:24 +0000 Subject: [PATCH 8/8] bump tomcat, java, add URL to Jenkins notify --- Dockerfile | 8 ++++---- Jenkinsfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 866b635..a19c347 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,14 +6,14 @@ 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 ) @@ -21,7 +21,7 @@ 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 +54,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' } diff --git a/Jenkinsfile b/Jenkinsfile index 4c4745c..33c46a5 100644 --- a/Jenkinsfile +++ b/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 }