From c382e1119a2b284e5d26bf96bd5a63ab1733f315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Mon, 1 Jun 2020 19:22:23 -0400 Subject: [PATCH] Update Foxy OpenSSL to 1.1.1g on Windows. (#454) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Foxy OpenSSL to 1.1.1g on Windows. This OpenSSL binary distribution also has a different default install location: C:\Program Files\OpenSSL-Win64 * Fix RTI_OPENSSL_LIBS envar name. The environment variable introduced in ros2/system_tests#409 is RTI_OPENSSL_LIBS not RTI_OPENSSL_LIB Signed-off-by: Steven! Ragnarök --- windows_docker_resources/Dockerfile.dashing | 2 +- windows_docker_resources/Dockerfile.foxy | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows_docker_resources/Dockerfile.dashing b/windows_docker_resources/Dockerfile.dashing index 5ff215ee2..fb2c47e50 100644 --- a/windows_docker_resources/Dockerfile.dashing +++ b/windows_docker_resources/Dockerfile.dashing @@ -118,7 +118,7 @@ ENV RTI_LICENSE_FILE C:\connext\rti_license.dat COPY rticonnextdds-src\openssl-1.0.2n-target-x64Win64VS2017.zip C:\TEMP\connext\ RUN 7z.exe x C:\TEMP\connext\openssl-1.0.2n-target-x64Win64VS2017.zip -aoa -oC:\connext\ ENV RTI_OPENSSL_BIN C:\connext\openssl-1.0.2n\x64Win64VS2017\release\bin -ENV RTI_OPENSSL_LIB C:\connext\openssl-1.0.2n\x64Win64VS2017\release\lib +ENV RTI_OPENSSL_LIBS C:\connext\openssl-1.0.2n\x64Win64VS2017\release\lib COPY rticonnextdds-src\rti_connext_dds-5.3.1-pro-host-x64Win64.exe.??? C:\TEMP\connext\ RUN copy /b C:\TEMP\connext\rti_connext_dds-5.3.1-pro-host-x64Win64.exe.??? C:\TEMP\connext\rti_connext_dds-5.3.1-pro-host-x64Win64.exe diff --git a/windows_docker_resources/Dockerfile.foxy b/windows_docker_resources/Dockerfile.foxy index 6451c026b..5d9c01c27 100644 --- a/windows_docker_resources/Dockerfile.foxy +++ b/windows_docker_resources/Dockerfile.foxy @@ -23,7 +23,7 @@ FROM mcr.microsoft.com/windows:$WINDOWS_RELEASE_VERSION 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_0_2u.exe C:\TEMP\Win64OpenSSL.exe +ADD https://slproweb.com/download/Win64OpenSSL-1_1_1g.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 @@ -78,11 +78,11 @@ 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 OPENSSL_CONF "C:\Program Files\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:\Program Files\OpenSSL-Win64\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 @@ -118,7 +118,7 @@ ENV RTI_LICENSE_FILE C:\connext\rti_license.dat COPY rticonnextdds-src\openssl-1.0.2n-target-x64Win64VS2017.zip C:\TEMP\connext\ RUN 7z.exe x C:\TEMP\connext\openssl-1.0.2n-target-x64Win64VS2017.zip -aoa -oC:\connext\ ENV RTI_OPENSSL_BIN C:\connext\openssl-1.0.2n\x64Win64VS2017\release\bin -ENV RTI_OPENSSL_LIB C:\connext\openssl-1.0.2n\x64Win64VS2017\release\lib +ENV RTI_OPENSSL_LIBS C:\connext\openssl-1.0.2n\x64Win64VS2017\release\lib COPY rticonnextdds-src\rti_connext_dds-5.3.1-pro-host-x64Win64.exe.??? C:\TEMP\connext\ RUN copy /b C:\TEMP\connext\rti_connext_dds-5.3.1-pro-host-x64Win64.exe.??? C:\TEMP\connext\rti_connext_dds-5.3.1-pro-host-x64Win64.exe