Skip to content

[24263] Fix TinyXML2 library resolution in tests #6329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiguelCompany merged 5 commits into from
Mar 23, 2026
Merged

[24263] Fix TinyXML2 library resolution in tests #6329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6326e5a
Fix example tests upgrading to ubuntu24
raulojeda22 Mar 13, 2026
2773115
Fix also dyn_network test
raulojeda22 Mar 13, 2026
c7ef33f
Add argument break system packages in docker ubuntu 24 psutil
raulojeda22 Mar 16, 2026
e0e165b
Install tinyxml2 instead of creating volume
raulojeda22 Mar 17, 2026
bb22b2e
Update copyright year of Dockerfile to 2026
raulojeda22 Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions test/dds/communication/dyn_network/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ if(NOT DOCKER_EXECUTABLE)
endif()

set(SHELL_EXECUTABLE "")
set(TINYXML2_LIB_DIR_COMPOSE_VOLUME "")
set(TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH "")

# Linux configurations
if(UNIX AND NOT(APPLE) AND NOT(QNXNTO) AND NOT(ANDROID))
Expand All @@ -47,13 +45,6 @@ else()
return()
endif()

# Configure TinyXML2 library path if installed in user library path
if(NOT (TINYXML2_FROM_SOURCE OR TINYXML2_FROM_THIRDPARTY))
get_filename_component(TINYXML2_LIB_DIR ${TINYXML2_LIBRARY} DIRECTORY)
set(TINYXML2_LIB_DIR_COMPOSE_VOLUME "- ${TINYXML2_LIB_DIR}:${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/fastdds:ro")
set(TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH ":${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/fastdds")
endif()

configure_file(cli.Dockerfile
${CMAKE_CURRENT_BINARY_DIR}/cli.Dockerfile @ONLY)
configure_file(ds_init_no_interfaces.compose.yml
Expand Down
6 changes: 3 additions & 3 deletions test/dds/communication/dyn_network/cli.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG ubuntu_version=22.04
ARG ubuntu_version=24.04
FROM ubuntu:$ubuntu_version AS ubuntu-cli

# Needed for a dependency that forces to set timezone
Expand All @@ -23,6 +23,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV DEBIAN_FRONTEND=noninteractive

# Install apt dependencies
RUN apt-get update && apt-get install --yes python3 python3-pip && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install --yes python3 python3-pip libtinyxml2-dev && rm -rf /var/lib/apt/lists/*

RUN pip3 install psutil
RUN pip3 install --break-system-packages psutil
5 changes: 2 additions & 3 deletions test/dds/communication/dyn_network/ds_init_no_interfaces.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ services:
build:
context: .
dockerfile: cli.Dockerfile
image: ubuntu-cli:22.04
image: ubuntu-cli:24.04
volumes:
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
- @CMAKE_INSTALL_PREFIX@:@CMAKE_INSTALL_PREFIX@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
environment:
# Load also fastdds libraries to run the CLI
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@:@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@:@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH
SERVER_IP: 127.0.0.1
working_dir: @PROJECT_BINARY_DIR@/test/dds/communication
command: @SHELL_EXECUTABLE@ "dyn_network/launch_ds_no_interfaces.bash"
Expand Down
18 changes: 5 additions & 13 deletions test/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ endif()
set(FILE_EXTENSION "")
set(DOCKER_IMAGE_NAME "")
set(SHELL_EXECUTABLE "")
set(TINYXML2_LIB_DIR_COMPOSE_VOLUME "")
set(TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH "")

# Configure TinyXML2 library path if installed in user library path
if(NOT (TINYXML2_FROM_SOURCE OR TINYXML2_FROM_THIRDPARTY))
get_filename_component(TINYXML2_LIB_DIR ${TINYXML2_LIBRARY} DIRECTORY)
set(TINYXML2_LIB_DIR_COMPOSE_VOLUME "- ${TINYXML2_LIB_DIR}:${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/fastdds:ro")
set(TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH ":${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/fastdds")
endif()

# Linux configurations
if(UNIX AND NOT(APPLE) AND NOT(QNXNTO) AND NOT(ANDROID))
Expand All @@ -44,16 +35,16 @@ if(UNIX AND NOT(APPLE) AND NOT(QNXNTO) AND NOT(ANDROID))
endif()

set(SHELL_EXECUTABLE ${BASH_EXECUTABLE})
set(DOCKER_IMAGE_NAME "ubuntu:22.04")
set(DOCKER_IMAGE_NAME "ubuntu-examples-test")
set(DOCKER_BUILD_COMPOSE "build:
context: ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu
dockerfile: Dockerfile")

set(PROJECT_BINARY_DIR_COMPOSE_VOLUME "${PROJECT_BINARY_DIR}:${PROJECT_BINARY_DIR}")
set(fastcdr_LIB_DIR_COMPOSE_VOLUME "${fastcdr_LIB_DIR}:${fastcdr_LIB_DIR}")
set(CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME "${CMAKE_INSTALL_PREFIX}:${CMAKE_INSTALL_PREFIX}")

set(PATH_ENVIRONMENT_VARIABLE_COMPOSE "LD_LIBRARY_PATH: ${PROJECT_BINARY_DIR}/src/cpp:${fastcdr_LIB_DIR}")
if (TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH)
set(PATH_ENVIRONMENT_VARIABLE_COMPOSE "${PATH_ENVIRONMENT_VARIABLE_COMPOSE}${TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH}")
endif()
set(EXAMPLE_PREFIX_DIR_COMPOSE "${PROJECT_BINARY_DIR}/examples/cpp")
set(EXAMPLE_SUFFIX_DIR_COMPOSE "")
set(FASTDDS_DEFAULT_PROFILES_FILE_PREFIX_COMPOSE "${PROJECT_BINARY_DIR}/examples/cpp")
Expand Down Expand Up @@ -85,6 +76,7 @@ elseif(WIN32)

set(FILE_EXTENSION ".exe")
set(DOCKER_IMAGE_NAME "windows-testing")
set(DOCKER_BUILD_COMPOSE "")

cmake_path(GET fastcdr_LIB_DIR PARENT_PATH fastcdr_INSTALL_DIR)

Expand Down
4 changes: 2 additions & 2 deletions test/examples/benchmark.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
@NETWORK_MODE_COMPOSE@
ipc: host
Expand All @@ -22,7 +23,6 @@ services:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/benchmark/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -31,6 +31,7 @@ services:
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/benchmark@FILE_EXTENSION@ subscriber --reliable --transient-local --samples 1000 @SUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@"

publisher:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
@NETWORK_MODE_COMPOSE@
ipc: host
Expand All @@ -39,7 +40,6 @@ services:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/benchmark/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
6 changes: 4 additions & 2 deletions test/examples/configuration.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
services:
subscriber:
container_name: subscriber-${CONTAINER_SUFFIX_COMPOSE}
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/configuration/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -30,12 +31,13 @@ services:

publisher-subscriber:
container_name: publisher-subscriber-${CONTAINER_SUFFIX_COMPOSE}
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/configuration/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
3 changes: 2 additions & 1 deletion test/examples/content_filter.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/content_filter/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
6 changes: 4 additions & 2 deletions test/examples/custom_payload_pool.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,26 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/custom_payload_pool/@EXAMPLE_SUFFIX_DIR_COMPOSE@
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/custom_payload_pool@FILE_EXTENSION@ subscriber --samples 10"

publisher:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/custom_payload_pool/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
9 changes: 6 additions & 3 deletions test/examples/delivery_mechanisms.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: subscriber_dm_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -30,13 +31,14 @@ services:
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 @ISOLATED_SUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@"

publisher-subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: publisher_subscriber_dm_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -47,13 +49,14 @@ services:
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ publisher --samples 10 @PUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@ @COMMAND_CONCATENATE_COMPOSE@ @COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 @SUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@@COMMAND_BACKGROUND_JOB_COMPOSE@"

pubsub:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: pubsub_dm_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
9 changes: 6 additions & 3 deletions test/examples/delivery_mechanisms_isolated.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: subscriber_dmi_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -32,13 +33,14 @@ services:
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 @ISOLATED_SUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@"

publisher-subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: publisher_subscriber_dmi_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -51,13 +53,14 @@ services:
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 @SUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@ @COMMAND_CONCATENATE_COMPOSE@ @COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ publisher --samples 10 @PUB_ADDITIONAL_ARGS_COMPOSE@@SPLIT_ARGS_COMPOSE@@COMMAND_BACKGROUND_JOB_COMPOSE@"

pubsub:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: pubsub_dmi_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
12 changes: 8 additions & 4 deletions test/examples/discovery_server.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: subscriber_ds_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/discovery_server/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -33,13 +34,14 @@ services:
ipv4_address: 172.150.0.2

publisher:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: publisher_ds_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/discovery_server/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -52,13 +54,14 @@ services:
ipv4_address: 172.150.0.3

server_1:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: ds1_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/discovery_server/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand All @@ -69,13 +72,14 @@ services:
ipv4_address: 172.150.0.4

server_2:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
container_name: ds2_${CONTAINER_SUFFIX_COMPOSE}
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/discovery_server/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
6 changes: 4 additions & 2 deletions test/examples/flow_control.compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,27 @@

services:
subscriber:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/flow_control/@EXAMPLE_SUFFIX_DIR_COMPOSE@
FASTDDS_DEFAULT_PROFILES_FILE: @FASTDDS_DEFAULT_PROFILES_FILE_PREFIX_COMPOSE@/flow_control/flow_control_profile.xml
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/flow_control@FILE_EXTENSION@ subscriber --samples 10"

publisher:
@DOCKER_BUILD_COMPOSE@
image: @DOCKER_IMAGE_NAME@
volumes:
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@

environment:
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/flow_control/@EXAMPLE_SUFFIX_DIR_COMPOSE@
Expand Down
Loading
Loading