From 880282891403d265433fcb98c1383d1ec5f58594 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 9 Jan 2020 21:54:34 +0000 Subject: [PATCH 1/2] bump tomcat, switch to corretto perm url --- Dockerfile | 22 ++++++++++++---------- test-compose/idp/Dockerfile | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6672e5..8cb41c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,19 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016 #settings ENV JAVA_OPTS='-Xmx3000m' ENV TOMCAT_MAJOR_VERSION=9 -ENV TOMCAT_VERSION=9.0.29 +ENV TOMCAT_VERSION=9.0.30 ENV CATALINA_HOME=c:\\Tomcat ENV IDP_VERSION=3.4.6 -ENV TIERVERSION=20191206 +ENV TIERVERSION=20200109 ### JAVA ### # ##below are settings for Corretto Java ENV JAVA_HOME='C:\Program Files\Amazon Corretto\jdk1.8.0_232' -ENV CORRETTO_VERSION='8.232.09.1' -ENV CORRETTO_FILE_VERSION='8.232.09.1' +#ENV CORRETTO_VERSION='8.232.09.1' +#ENV CORRETTO_FILE_VERSION='8.232.09.1' +ENV CORRETTO_URL_PERM='https://corretto.aws/downloads/latest/amazon-corretto-8-x64-windows-jdk.msi' +ENV CORRETTO_INSTALL_FILE='amazon-corretto-8-x64-windows-jdk.msi' ##below is for Zulu Java #ENV JAVA_HOME='c:\zulujava\zulu-8\' @@ -28,11 +30,11 @@ RUN powershell [Environment]::SetEnvironmentVariable('JAVA_HOME', '%JAVA_HOME%', ENV SHIB_INSTALL_FILE=C:\\shibboleth-identity-provider-$IDP_VERSION-x64.msi ###install Corretto Java -RUN powershell (new-object System.Net.WebClient).Downloadfile('https://d3pxv6yz143wms.cloudfront.net/%CORRETTO_VERSION%/amazon-corretto-%CORRETTO_FILE_VERSION%-windows-x64.msi', 'C:\corretto-java-%CORRETTO_VERSION%') -RUN powershell If ((Get-FileHash C:\corretto-java-%CORRETTO_VERSION% -Algorithm MD5).Hash.ToLower() -eq '620ee139aac5f05ab404006b5e33378f') { ` \ - start-process -filepath c:\windows\system32\msiexec.exe -passthru -wait -argumentlist '/i','C:\corretto-java-%CORRETTO_VERSION%','/qn' ` \ - } Else { throw 'bad hash comparison on Zulu Java download' } -RUN del C:\corretto-java-%CORRETTO_VERSION% +RUN powershell (new-object System.Net.WebClient).Downloadfile('%CORRETTO_URL_PERM%', 'C:\%CORRETTO_INSTALL_FILE%') +RUN powershell If ((Get-FileHash C:\%CORRETTO_INSTALL_FILE% -Algorithm MD5).Hash.ToLower() -eq '620ee139aac5f05ab404006b5e33378f') { ` \ + start-process -filepath c:\windows\system32\msiexec.exe -passthru -wait -argumentlist '/i','C:\%CORRETTO_INSTALL_FILE%','/qn' ` \ + } Else { throw 'bad hash comparison on Corretto Java download' } +RUN del C:\%CORRETTO_INSTALL_FILE% ###install Zulu Java #RUN powershell (new-object System.Net.WebClient).Downloadfile('https://cdn.azul.com/zulu/bin/%JAVA_INSTALL_FILENAME%', 'C:\%JAVA_INSTALL_FILENAME%') @@ -68,7 +70,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 ` \ - '58b85ab414cd5c9fda01b26dea378983834d6fa15702e6d1cddb85a40d537f46cafae51e15a33e7a618456178146cc6a1136f7b83369a1651f7bef393c4ce011') ` \ + '07356fd3c8e57437f5b6e1afc3cc7ea6d62f7855095b5c99dfda54b86298a5fa078d29bda3e939b87a89e4565b8a68d01590da18051ea76bb472e5dc8034f653') ` \ { ` \ 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/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile index c27cfe1..0f75d6b 100644 --- a/test-compose/idp/Dockerfile +++ b/test-compose/idp/Dockerfile @@ -1,4 +1,4 @@ -FROM tier/shib-idp-windows:latest +FROM tier/shib-idp-windows:20200109_3.4.6 #params for supplying your IdP config to your container (can be overridden at build-time using build-args) ARG TOMCFG=config\\tomcat From f5b1c4eff11f2571959443394f5920fd83c1dfd5 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 9 Jan 2020 21:55:40 +0000 Subject: [PATCH 2/2] remove cruft --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8cb41c3..7fff9b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,6 @@ ENV TIERVERSION=20200109 # ##below are settings for Corretto Java ENV JAVA_HOME='C:\Program Files\Amazon Corretto\jdk1.8.0_232' -#ENV CORRETTO_VERSION='8.232.09.1' -#ENV CORRETTO_FILE_VERSION='8.232.09.1' ENV CORRETTO_URL_PERM='https://corretto.aws/downloads/latest/amazon-corretto-8-x64-windows-jdk.msi' ENV CORRETTO_INSTALL_FILE='amazon-corretto-8-x64-windows-jdk.msi'