From fa972bb0ec81064ed5fe99b7cda723a1ff26c589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Mon, 7 Apr 2025 19:57:10 -0700 Subject: [PATCH 01/15] Use powershell script to install connext binaries. Moving the condition to a separate script cuts out one level of juggling and escaping. --- windows_docker_resources/Dockerfile | 8 ++------ .../rti_web_binaries_install.ps1 | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 windows_docker_resources/rti_web_binaries_install.ps1 diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index 2ecb1d10..e4739c43 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -58,12 +58,8 @@ RUN copy /b C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64V COPY rticonnextdds-license\rti_license.dat $RTI_LICENSE_FILE # Install Connext -RUN C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe --mode unattended --unattendedmodeui minimalWithDialogs --prefix C:\connext -RUN %CONNEXTDDS_DIR%\bin\rtipkginstall.bat -u C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg -RUN %CONNEXTDDS_DIR%\bin\rtipkginstall.bat -u C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg -RUN %CONNEXTDDS_DIR%\bin\rtipkginstall.bat -u C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg -RUN %CONNEXTDDS_DIR%\bin\rtipkginstall.bat -u C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg -RUN %CONNEXTDDS_DIR%\bin\rtipkginstall.bat -u C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg +COPY rti_web_binaries_install.ps C:\TEMP\rti_web_binaries_install.ps1 +RUN powershell C:\TEMP\rti_web_binaries_install.ps1 # Note that this *must* be in shell form, not exec form, so Docker on Windows appropriately substitutes %CI_ARGS% WORKDIR C:\ci diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 new file mode 100644 index 00000000..0032aeee --- /dev/null +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -0,0 +1,15 @@ + if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { + pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" + "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" +} else { + "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix C:\connext + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg" + $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg" +} From ec311c5ca4a347da783c874938c338a0769e557b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 11:29:14 -0700 Subject: [PATCH 02/15] Pass RTI variables through docker build args. --- windows_docker_resources/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index e4739c43..7d44861b 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -44,11 +44,14 @@ RUN powershell -noexit irm https://raw.githubusercontent.com/ros2/ros2/refs/head RUN pixi --color never --no-progress -q install RUN pixi --color never --no-progress -q list -# Setup environment variables needed for Connext +# Setup environment variables needed for Connext using build args ENV RTI_LICENSE_FILE C:\connext\rti_license.dat -ENV CONNEXTDDS_DIR C:\connext\rti_connext_dds-7.3.0 -ENV RTI_OPENSSL_BIN C:\connext\openssl-3.0.12\x64Win64VS2017\bin -ENV RTI_OPENSSL_LIB C:\connext\openssl-3.0.12\x64Win64VS2017\lib +ARG CONNEXTDDS_DIR C:\connext\rti_connext_dds-7.3.0 +ENV CONNEXTDDS_DIR $CONNEXTDDS_DIR +ARG RTI_OPENSSL_BIN C:\connext\openssl-3.0.12\x64Win64VS2017\bin +ENV RTI_OPENSSL_BIN $RTI_OPENSSL_BIN +ARG RTI_OPENSSL_LIB C:\connext\openssl-3.0.12\x64Win64VS2017\lib +ENV RTI_OPENSSL_LIB $RTI_OPENSSL_LIB # Copy over necessary Connext files into container RUN IF NOT EXIST "C:\TEMP" mkdir C:\TEMP From f4b87f6c8dce826e3e34b01a71c52f1b842d42fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 11:29:14 -0700 Subject: [PATCH 03/15] Pass RTI variables through docker build args. --- job_templates/ci_job.xml.em | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em index 666402fb..2346f4ac 100644 --- a/job_templates/ci_job.xml.em +++ b/job_templates/ci_job.xml.em @@ -248,6 +248,13 @@ set /p RELEASE_VERSION=< release_version.txt rem "Put current date in Dockerfile to force cache invalidation once per day" powershell "(Get-Content ${Env:DOCKERFILE}).replace('@@today_str', $(Get-Date).ToLongDateString()) | Set-Content ${Env:DOCKERFILE}" set BUILD_ARGS=--build-arg WINDOWS_RELEASE_VERSION=%RELEASE_VERSION% --build-arg ROS_DISTRO=%CI_ROS_DISTRO% +if "!ROS_DISTRO!" == "humble" ( + set "BUILD_ARGS=!BUILD_ARGS! --build-arg CONNEXTDDS_DIR=C:\connext\rti_connext_dds-6.0.1 --build-arg RTI_OPENSSL_BIN=C:\connext\openssl-1.1.1k\x64Win64VS2017\bin --build-arg RTI_OPENSSL_LIB=C:\connext\openssl-1.1.1k\x64Win64VS2017\lib" +) else if "!ROS_DISTRO!" == "jazzy" ( + set "BUILD_ARGS=!BUILD_ARGS! --build-arg CONNEXTDDS_DIR=C:\connext\rti_connext_dds-6.0.1 --build-arg RTI_OPENSSL_BIN=C:\connext\openssl-1.1.1k\x64Win64VS2017\bin --build-arg RTI_OPENSSL_LIB=C:\connext\openssl-1.1.1k\x64Win64VS2017\lib" +) else ( + set "BUILD_ARGS=!BUILD_ARGS! --build-arg CONNEXTDDS_DIR=C:\connext\rti_connext_dds-7.3.0 --build-arg RTI_OPENSSL_BIN=C:\connext\openssl-3.0.12\x64Win64VS2017\bin --build-arg RTI_OPENSSL_LIB=C:\connext\openssl-3.0.12\x64Win64VS2017\lib" +) docker build %BUILD_ARGS% -t %CONTAINER_NAME% -f %DOCKERFILE% windows_docker_resources || exit /b !ERRORLEVEL! echo "# END SECTION" From 74a1e91a12d8710af9a60916b153471d0e9be1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 15:55:04 -0700 Subject: [PATCH 04/15] Call scripts explicitly with &. --- .../rti_web_binaries_install.ps1 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 0032aeee..0aac2e66 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -1,15 +1,15 @@ if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" - "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" + & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" } else { "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix C:\connext - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg" - $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg" + & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg" } From cb62212d718b77e8197f712199f00150d3b915cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 16:16:12 -0700 Subject: [PATCH 05/15] Call with parameters in array. --- windows_docker_resources/rti_web_binaries_install.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 0aac2e66..3252d5b1 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -1,12 +1,12 @@ if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" - & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext" + UUn& "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @(--mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext") & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" } else { - "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" --mode unattended --unattendedmodeui minimalWithDialogs --prefix C:\connext + "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" @(--mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext") & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" From db1d27c0ab813f04f7867a1c2ec6f2917744718a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 16:17:53 -0700 Subject: [PATCH 06/15] Typos. --- windows_docker_resources/rti_web_binaries_install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 3252d5b1..8d2cc819 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -1,6 +1,6 @@ if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" - UUn& "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @(--mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext") + & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @(--mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext") & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" From b0b64fe8535c89fb852efcb3d006d007aa76b9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 16:25:38 -0700 Subject: [PATCH 07/15] quotes and separators. --- windows_docker_resources/rti_web_binaries_install.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 8d2cc819..3e341ea0 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -1,12 +1,12 @@ if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" - & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @(--mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext") + & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs". "--prefix", "C:\connext") & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" } else { - "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" @(--mode unattended --unattendedmodeui minimalWithDialogs --prefix "C:\connext") + "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" From 0cf16d67e3e78b7d8651a0724fa18bebf43bc6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Apr 2025 16:30:13 -0700 Subject: [PATCH 08/15] Spaghetti. --- windows_docker_resources/rti_web_binaries_install.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 3e341ea0..bfbe98bd 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -6,7 +6,8 @@ & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" } else { - "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") + $params = @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") + "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" $params & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" From ddb472f604047580a48ea1b79cd2249f01398e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Fri, 11 Apr 2025 11:03:03 -0700 Subject: [PATCH 09/15] We can do it. --- windows_docker_resources/rti_web_binaries_install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index bfbe98bd..fdf48ec7 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -7,7 +7,7 @@ & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" } else { $params = @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") - "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" $params + & "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" $params & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" From 8412414e013806f163d19b82bb4cb4ec06ea4ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Fri, 11 Apr 2025 11:40:47 -0700 Subject: [PATCH 10/15] Typo. --- windows_docker_resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index 7d44861b..d45966de 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -61,7 +61,7 @@ RUN copy /b C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64V COPY rticonnextdds-license\rti_license.dat $RTI_LICENSE_FILE # Install Connext -COPY rti_web_binaries_install.ps C:\TEMP\rti_web_binaries_install.ps1 +COPY rti_web_binaries_install.ps1 C:\TEMP\rti_web_binaries_install.ps1 RUN powershell C:\TEMP\rti_web_binaries_install.ps1 # Note that this *must* be in shell form, not exec form, so Docker on Windows appropriately substitutes %CI_ARGS% From c47a3bfb557cf1da19ec947dd9bf1ed027a5a48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Fri, 11 Apr 2025 12:00:54 -0700 Subject: [PATCH 11/15] I think this will do it. --- .../rti_web_binaries_install.ps1 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index fdf48ec7..0475ca91 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -8,9 +8,15 @@ } else { $params = @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") & "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" $params - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg" + $ssl_host_params = @("-u", "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg") + $ssl_target_params = @("-u", "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg") + $connext_pro_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg") + $rti_security_host_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg") + $rti_security_target_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg") + + & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_host_params + & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_target_params + & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $connext_pro_params + & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_host_params + & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_target_params } From 99210aded7433e1c5a0813b0508199c51bc11340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Fri, 11 Apr 2025 12:07:17 -0700 Subject: [PATCH 12/15] Puts debugging. --- windows_docker_resources/rti_web_binaries_install.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 0475ca91..c6507fcd 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -1,3 +1,5 @@ + write-output ROS_DISTRO $Env:ROS_DISTRO + write-output CONNEXTDDS_DIR $Env:CONNEXTDDS_DIR if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs". "--prefix", "C:\connext") From 1793056def2c32235dcba3423a83110f89d50013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Fri, 11 Apr 2025 19:42:54 -0700 Subject: [PATCH 13/15] If this is it I'll scream. --- windows_docker_resources/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index d45966de..2c46f59e 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -46,11 +46,11 @@ RUN pixi --color never --no-progress -q list # Setup environment variables needed for Connext using build args ENV RTI_LICENSE_FILE C:\connext\rti_license.dat -ARG CONNEXTDDS_DIR C:\connext\rti_connext_dds-7.3.0 +ARG CONNEXTDDS_DIR=C:\connext\rti_connext_dds-7.3.0 ENV CONNEXTDDS_DIR $CONNEXTDDS_DIR -ARG RTI_OPENSSL_BIN C:\connext\openssl-3.0.12\x64Win64VS2017\bin +ARG RTI_OPENSSL_BIN=C:\connext\openssl-3.0.12\x64Win64VS2017\bin ENV RTI_OPENSSL_BIN $RTI_OPENSSL_BIN -ARG RTI_OPENSSL_LIB C:\connext\openssl-3.0.12\x64Win64VS2017\lib +ARG RTI_OPENSSL_LIB=C:\connext\openssl-3.0.12\x64Win64VS2017\lib ENV RTI_OPENSSL_LIB $RTI_OPENSSL_LIB # Copy over necessary Connext files into container From 1fa02c019721d79c8b8242012a37cd40933ece9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Fri, 11 Apr 2025 20:10:39 -0700 Subject: [PATCH 14/15] Use cmd.exe to call batch scripts. --- .../rti_web_binaries_install.ps1 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index c6507fcd..50896517 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -3,10 +3,10 @@ if ( $Env:ROS_DISTRO -eq "jammy" -or $Env:ROS_DISTRO -eq "humble" ) { pixi run 7z x -oC:\connext "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-target-x64Win64VS2017.zip" & "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-host-x64Win64.exe" @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs". "--prefix", "C:\connext") - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" - & $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" + cmd.exe /c $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\openssl-1.1.1k-6.0.1.25-host-x64Win64.rtipkg" + cmd.exe /c $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_connext_dds-6.0.1-pro-target-x64Win64VS2017.rtipkg" + cmd.exe /c $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-host-x64Win64.rtipkg" + cmd.exe /c $Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat -u "C:\TEMP\rticonnextdds-src\rti_security_plugins-6.0.1.25-target-x64Win64VS2017.rtipkg" } else { $params = @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") & "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" $params @@ -16,9 +16,9 @@ $rti_security_host_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg") $rti_security_target_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg") - & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_host_params - & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_target_params - & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $connext_pro_params - & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_host_params - & "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_target_params + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_host_params + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_target_params + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $connext_pro_params + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_host_params + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_target_params } From f07636ea48a50b14ce97967b4a07a68faa084a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Fri, 11 Apr 2025 20:52:37 -0700 Subject: [PATCH 15/15] Keep going. --- .../rti_web_binaries_install.ps1 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/windows_docker_resources/rti_web_binaries_install.ps1 b/windows_docker_resources/rti_web_binaries_install.ps1 index 50896517..b5bbfbb2 100644 --- a/windows_docker_resources/rti_web_binaries_install.ps1 +++ b/windows_docker_resources/rti_web_binaries_install.ps1 @@ -10,15 +10,11 @@ } else { $params = @("--mode", "unattended", "--unattendedmodeui", "minimalWithDialogs", "--prefix", "C:\connext") & "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-host-x64Win64.exe" $params - $ssl_host_params = @("-u", "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg") - $ssl_target_params = @("-u", "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg") - $connext_pro_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg") - $rti_security_host_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg") - $rti_security_target_params = @("-u", "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg") + $rti_security_target_params = @() - cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_host_params - cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $ssl_target_params - cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $connext_pro_params - cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_host_params - cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" $rti_security_target_params + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" "-u" "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" "-u" "C:\TEMP\rticonnextdds-src\openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" "-u" "C:\TEMP\rticonnextdds-src\rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" "-u" "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-host-x64Win64.rtipkg" + cmd.exe /c "$Env:CONNEXTDDS_DIR\bin\rtipkginstall.bat" "-u" "C:\TEMP\rticonnextdds-src\rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg" }