install openssl from chocolatey

this gives continuous upgrade and prevent installation failures when weblink using hardcoded version number breaks Signed-off-by: Mikael Arguedas <[email protected]>
ros2 · Apr 5, 2020 · d4b59ee · d4b59ee
1 parent 48a79b5
commit d4b59ee
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/windows_docker_resources/Dockerfile.msvc2019 b/windows_docker_resources/Dockerfile.msvc2019
@@ -16,8 +16,6 @@ FROM mcr.microsoft.com/windows:$WINDOWS_RELEASE_ID
 # Regularly updated installers are next to their associated code.
 ADD https://github.com/ADLINK-IST/opensplice/releases/download/OSPL_V6_9_190925OSS_RELEASE/PXXX-VortexOpenSplice-6.9.190925OSS-HDE-x86_64.win-vs2019-installer.zip C:\TEMP\OpenSplice.zip
 
-# OpenSSL
-ADD https://slproweb.com/download/Win64OpenSSL-1_1_1f.exe C:\TEMP\Win64OpenSSL.exe
 
 # OpenCV
 ADD https://github.com/ros2/ros2/releases/download/opencv-archives/opencv-3.4.6-vc16.VS2019.zip C:\TEMP\opencv.zip
@@ -52,11 +50,9 @@ RUN C:\TEMP\python-37.exe /quiet `
 RUN powershell -noexit "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
 
 # choco installs
-RUN choco install -y cmake curl git vcredist2013 vcredist140 cppcheck patch
+RUN choco install -y cmake curl git vcredist2013 vcredist140 cppcheck patch openssl
 RUN choco install -y -s C:\TEMP asio cunit eigen tinyxml-usestl tinyxml2 log4cxx bullet
 
-RUN C:\TEMP\Win64OpenSSL.exe /VERYSILENT
-
 # For extracting .7z files
 ADD https://www.7-zip.org/a/7z1900-x64.exe C:\TEMP\
 RUN C:\TEMP\7z1900-x64.exe /S /D="C:\Program Files\7-zip"
@@ -72,11 +68,10 @@ RUN 7z.exe x C:\TEMP\opencv.zip -aoa -oC:\
 RUN 7z.exe x C:\TEMP\OpenSplice.zip -aoa -oC:\opensplice
 
 # Environment setup
-ENV OPENSSL_CONF C:\OpenSSL-Win64\bin\openssl.cfg
 ENV OpenCV_DIR C:\opencv
 ENV OSPL_HOME C:\opensplice\HDE\x86_64.win64
 # You can't use ENV to append to the PATH https://stackoverflow.com/questions/42092932/appending-to-path-in-a-windows-docker-container
-RUN setx PATH "%PATH%;C:\Program Files\Git\cmd;C:\Program Files\CMake\bin;C:\OpenSSL-Win64\bin\;C:\xmllint\bin;"C:\opencv\x64\vc16\bin"
+RUN setx PATH "%PATH%;C:\Program Files\Git\cmd;C:\Program Files\CMake\bin;C:\xmllint\bin;"C:\opencv\x64\vc16\bin"
 
 RUN powershell -Command Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1
 RUN mkdir C:\ws