diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile index 492b8526..9650b5f5 100644 --- a/linux_docker_resources/Dockerfile +++ b/linux_docker_resources/Dockerfile @@ -161,7 +161,7 @@ RUN pip3 install -U git+https://github.com/ahcorde/lcov-to-cobertura-xml@master RUN if test \( ${PLATFORM} = x86 -a ${INSTALL_CONNEXT_DEBS} = true \); then \ if test \( ${ROS_DISTRO} = humble -o ${ROS_DISTRO} = jazzy \); then \ apt-get update && RTI_NC_LICENSE_ACCEPTED=yes apt-get install -y rti-connext-dds-6.0.1; \ - elif test ${ROS_DISTRO} = kilted; then \ + elif test ${ROS_DISTRO} = kilted -o 1; then \ apt-get update && RTI_NC_LICENSE_ACCEPTED=yes apt-get install -y rti-connext-dds-7.3.0-ros; \ else \ apt-get update && RTI_NC_LICENSE_ACCEPTED=yes apt-get install -y rti-connext-dds-7.7.0-ros; \ @@ -187,7 +187,7 @@ if test ${ROS_DISTRO} = jazzy -o ${ROS_DISTRO} = humble; then \ /tmp/rticonnextdds-src/rti_connext_dds-6.0.1.25-pro-target-x64Linux4gcc7.3.0.rtipkg; do \ cat $(echo ${splitpkg}.0?? | sort) > $splitpkg; \ done; \ -elif test ${ROS_DISTRO} = kilted; then \ +elif test ${ROS_DISTRO} = kilted -o 1; then \ for splitpkg in \ /tmp/rticonnextdds-src/rti_connext_dds-7.3.0-pro-host-x64Linux.run \ /tmp/rticonnextdds-src/rti_connext_dds-7.3.0-pro-target-x64Linux4gcc7.3.0.rtipkg; do \ diff --git a/linux_docker_resources/entry_point.sh b/linux_docker_resources/entry_point.sh index c9afaf2d..e6b83829 100755 --- a/linux_docker_resources/entry_point.sh +++ b/linux_docker_resources/entry_point.sh @@ -57,21 +57,13 @@ if [ "${ARCH}" = "x86_64" -a "${ID}" = "ubuntu" ]; then # - OpenSSL version: 1.1.1k # - Base architecture: x64Linux2.6gcc4.4.5 # - Target architecture: x64Linux4gcc7.3.0 - export CONNEXT_FULL_VERSION="7.7.0" + export CONNEXT_FULL_VERSION="7.3.0" export CONNEXT_DISPLAY_VERSION="$CONNEXT_FULL_VERSION" - export OPENSSL_FULL_VERSION="3.5.5" + export OPENSSL_FULL_VERSION="3.0.12" export OPENSSL_DISPLAY_VERSION="${OPENSSL_FULL_VERSION%.*}" - export CONNEXT_BASE_ARCH="x64Linux4gcc8.5.0" - export CONNEXT_TARGET_ARCH="$CONNEXT_BASE_ARCH" + export CONNEXT_BASE_ARCH="x64Linux3gcc4.8.2" + export CONNEXT_TARGET_ARCH="x64Linux4gcc7.3.0" case "${ROS_DISTRO}" in - lyrical) - export CONNEXT_FULL_VERSION="7.7.0" - export CONNEXT_DISPLAY_VERSION="$CONNEXT_FULL_VERSION" - export OPENSSL_FULL_VERSION="3.5.5" - export OPENSSL_DISPLAY_VERSION="${OPENSSL_FULL_VERSION%.*}" - export CONNEXT_BASE_ARCH="x64Linux4gcc8.5.0" - export CONNEXT_TARGET_ARCH="$CONNEXT_BASE_ARCH" - ;; kilted) export CONNEXT_FULL_VERSION="7.3.0" export CONNEXT_DISPLAY_VERSION="$CONNEXT_FULL_VERSION" diff --git a/windows_docker_resources/rti_web_binaries_install_script.ps1 b/windows_docker_resources/rti_web_binaries_install_script.ps1 index 1348b89f..7af2f7fd 100644 --- a/windows_docker_resources/rti_web_binaries_install_script.ps1 +++ b/windows_docker_resources/rti_web_binaries_install_script.ps1 @@ -11,7 +11,7 @@ $connextRoot = "C:\connext" $tempRoot = "C:\TEMP\rticonnextdds-src" $licenseFile = "C:\connext\rti_license.dat" -if ($RosDistro -eq "kilted") { +if ($true -or $RosDistro -eq "kilted") { $ConnextVersion = "7.3.0" $OpenSslVersion = "3.0.12" $ConnextDir = "C:\connext\rti_connext_dds-7.3.0" @@ -22,8 +22,8 @@ if ($RosDistro -eq "kilted") { $TargetInstaller = "rti_connext_dds-7.3.0-pro-target-x64Win64VS2017.rtipkg" $OpenSslHostInstaller = "openssl-3.0.12-7.3.0-host-x64Win64.rtipkg" $OpenSslTargetInstaller = "openssl-3.0.12-7.3.0-target-x64Win64VS2017.rtipkg" - $SecurityHostInstaller = "rti_security_plugins-7.3.0-host-x64Win64.rtipkg" - $SecurityTargetInstaller = "rti_security_plugins-7.3.0-target-x64Win64VS2017.rtipkg" + $SecurityHostInstaller = "rti_security_plugins-7.3.0-host-openssl-3.0-x64Win64.rtipkg" + $SecurityTargetInstaller = "rti_security_plugins-7.3.0-target-openssl-3.0-x64Win64VS2017.rtipkg" } else { $ConnextVersion = "7.7.0" diff --git a/windows_docker_resources/rticonnextdds-src b/windows_docker_resources/rticonnextdds-src index 47d39bed..fddb9a9d 160000 --- a/windows_docker_resources/rticonnextdds-src +++ b/windows_docker_resources/rticonnextdds-src @@ -1 +1 @@ -Subproject commit 47d39bed12eee105d00a5019de2ec6c98221bbb3 +Subproject commit fddb9a9d3b4f9dbc1a6eed41856e56813773a27e