Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #14 from docker/20191206_3.4.6
bump tomcat to 9.0.29
pcaskey committed Dec 6, 2019
2 parents cf0c64b + 5f135e1 commit b0574f0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
@@ -3,10 +3,10 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
#settings
ENV JAVA_OPTS='-Xmx3000m'
ENV TOMCAT_MAJOR_VERSION=9
ENV TOMCAT_VERSION=9.0.27
ENV TOMCAT_VERSION=9.0.29
ENV CATALINA_HOME=c:\\Tomcat
ENV IDP_VERSION=3.4.6
ENV TIERVERSION=20191002
ENV TIERVERSION=20191206

### JAVA ###
#
@@ -68,7 +68,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 ` \
'b7d19fb71336e8d3d78e63b770d675dc5e429b98c29e6b1c38d7642ad2b111558885c996f8a209391f8cbf72fed1d782c884f1cd1d58c41542af8e2efc7a0f67') ` \
'58b85ab414cd5c9fda01b26dea378983834d6fa15702e6d1cddb85a40d537f46cafae51e15a33e7a618456178146cc6a1136f7b83369a1651f7bef393c4ce011') ` \
{ ` \
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' }

0 comments on commit b0574f0

Please sign in to comment.