Skip to content

Commit 66c86e7

Browse files
committed
Refs #21886: Mount shared volumes in C: drive inside docker
Signed-off-by: Mario Dominguez <[email protected]>
1 parent 38142de commit 66c86e7

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

test/examples/CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,24 @@ elseif(WIN32)
4949

5050
# Temporary, in the is installed here
5151
set(SHELL_EXECUTABLE "C:/Program Files/PowerShell/latest/pwsh.exe")
52-
52+
5353
set(FILE_EXTENSION ".exe")
5454
set(DOCKER_IMAGE_NAME "windows-testing")
55-
55+
5656
cmake_path(GET fastcdr_LIB_DIR PARENT_PATH fastcdr_INSTALL_DIR)
5757

58+
# Ensure drives in docker are mounted in C: drive
59+
string(REGEX REPLACE ".:" "C:" CMAKE_INSTALL_PREFIX_C ${CMAKE_INSTALL_PREFIX})
60+
string(REGEX REPLACE ".:" "C:" PROJECT_BINARY_DIR_C ${PROJECT_BINARY_DIR})
61+
string(REGEX REPLACE ".:" "C:" fastcdr_INSTALL_DIR_C ${fastcdr_INSTALL_DIR})
62+
5863
set(WIN_DOCKERFILE ${CMAKE_CURRENT_LIST_DIR}/windows/Dockerfile)
5964
# Generate image for testing
6065
add_custom_target(
6166
windows_docker_image_testing_generation
6267
ALL
6368
# Launch the docker build command using the build context.
64-
COMMAND ${DOCKER_EXECUTABLE} build
69+
COMMAND ${DOCKER_EXECUTABLE} build
6570
--tag ${DOCKER_IMAGE_NAME}
6671
--file ${WIN_DOCKERFILE}
6772
${CMAKE_CURRENT_LIST_DIR}

test/examples/hello_world.compose.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ services:
1616
waitset-subscriber:
1717
image: @DOCKER_IMAGE_NAME@
1818
volumes:
19-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
20-
- @fastcdr_INSTALL_DIR@/bin:@fastcdr_INSTALL_DIR@/bin
21-
- @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/bin
19+
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR_C@
20+
- @fastcdr_INSTALL_DIR@/bin:@fastcdr_INSTALL_DIR_C@/bin
21+
- @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX_C@/bin
2222
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2323
environment:
24-
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
25-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/Release
26-
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
24+
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX_C@/bin;@fastcdr_INSTALL_DIR_C@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
25+
EXAMPLE_DIR: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/Release
26+
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/hello_world_profile.xml
2727
command: @SHELL_EXECUTABLE@ -c "& $$Env:EXAMPLE_DIR/hello_world@FILE_EXTENSION@ subscriber --waitset --samples 30"
2828

2929
subscriber-publisher:
3030
image: @DOCKER_IMAGE_NAME@
3131
volumes:
32-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
33-
- @fastcdr_INSTALL_DIR@/bin:@fastcdr_INSTALL_DIR@/bin
34-
- @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/bin
32+
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR_C@
33+
- @fastcdr_INSTALL_DIR@/bin:@fastcdr_INSTALL_DIR_C@/bin
34+
- @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX_C@/bin
3535
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
3636
environment:
37-
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
38-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/Release
39-
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
37+
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX_C@/bin;@fastcdr_INSTALL_DIR_C@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
38+
EXAMPLE_DIR: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/Release
39+
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR_C@/examples/cpp/hello_world/hello_world_profile.xml
4040
command: @SHELL_EXECUTABLE@ -c "& $$Env:EXAMPLE_DIR/hello_world@FILE_EXTENSION@ publisher --samples 30 &" "& $$Env:EXAMPLE_DIR/hello_world@FILE_EXTENSION@ subscriber --samples 30; Receive-Job 1 -Wait"
4141
depends_on:
4242
- waitset-subscriber

0 commit comments

Comments
 (0)