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