From c648e568c9b5da928056616485e4df1eb20333d1 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 21 Nov 2018 16:52:37 -0600 Subject: [PATCH 1/4] Update 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 0457b832a9c288b696b50a3e250195e31f3f89a9 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 14 Jan 2019 15:06:41 -0600 Subject: [PATCH 2/4] bump java, tomcat, shibb --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba139d1..ad88341 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.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.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 '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 53151576ec9c77fb18adfde84f65b8e2fc43f668 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 14 Jan 2019 15:52:08 -0600 Subject: [PATCH 3/4] fix typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad88341..ed219df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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') ` \ From 214589396bf7d02bb2de3357b8a1f67a1f3ea0b7 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 14 Jan 2019 16:01:40 -0600 Subject: [PATCH 4/4] another typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed219df..a661636 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,7 +84,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