Skip to content

Commit e059003

Browse files
Mario-DLMario-DL
committed
Refs #21886: Update docker compose file structure of the rest of examples
Signed-off-by: Mario Dominguez <[email protected]>
1 parent 3046c0f commit e059003

15 files changed

+280
-301
lines changed

‎test/examples/configuration.compose.yml

+14-15
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,33 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
version: "3"
1514

1615
services:
1716
subscriber:
1817
image: @DOCKER_IMAGE_NAME@
1918
volumes:
20-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
21-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
19+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
20+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
21+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
2222
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2323
environment:
24-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
25-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
26-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/configuration
27-
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/configuration/configuration_profile.xml
24+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
25+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/configuration/@EXAMPLE_SUFFIX_DIR_COMPOSE@
26+
FASTDDS_DEFAULT_PROFILES_FILE: @FASTDDS_DEFAULT_PROFILES_FILE_PREFIX_COMPOSE@/configuration/configuration_profile.xml
2827
SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${SUB_ARGS}
29-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/configuration@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
28+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/configuration@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
3029

3130
publisher-subscriber:
3231
image: @DOCKER_IMAGE_NAME@
3332
volumes:
34-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
35-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
33+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
34+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
35+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
3636
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
3737
environment:
38-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
39-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
40-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/configuration
41-
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/configuration/configuration_profile.xml
38+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
39+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/configuration/@EXAMPLE_SUFFIX_DIR_COMPOSE@
40+
FASTDDS_DEFAULT_PROFILES_FILE: @FASTDDS_DEFAULT_PROFILES_FILE_PREFIX_COMPOSE@/configuration/configuration_profile.xml
4241
PUBLISHER_ADDITIONAL_ARGUMENTS: ${PUB_ARGS}
4342
SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${SUB_ARGS}
44-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/configuration@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS} & $${EXAMPLE_DIR}/configuration@FILE_EXTENSION@ publisher --samples 10 --wait 2 $${PUBLISHER_ADDITIONAL_ARGUMENTS}"
43+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/configuration@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS} @COMMAND_CONCATENATE_COMPOSE@ @COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/configuration@FILE_EXTENSION@ publisher --samples 10 --wait 2 $${PUBLISHER_ADDITIONAL_ARGUMENTS}@COMMAND_BACKGROUND_JOB_COMPOSE@"

‎test/examples/content_filter.compose.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
version: "3"
1514

1615
services:
1716
subscriber:
1817
image: @DOCKER_IMAGE_NAME@
1918
volumes:
20-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
21-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
19+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
20+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
21+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
2222
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2323
environment:
24-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
25-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
26-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/content_filter@FILE_EXTENSION@
24+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
25+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/content_filter/@EXAMPLE_SUFFIX_DIR_COMPOSE@
2726
SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${SUB_ARGS}
28-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/content_filter@FILE_EXTENSION@ subscriber $${SUBSCRIBER_ADDITIONAL_ARGUMENTS} --lower-bound 4 --upper-bound 8 --reliable --transient-local & $${EXAMPLE_DIR}/content_filter@FILE_EXTENSION@ publisher --samples 15 --interval 100 --reliable --transient-local"
27+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/content_filter@FILE_EXTENSION@ subscriber $${SUBSCRIBER_ADDITIONAL_ARGUMENTS} --lower-bound 4 --upper-bound 8 --reliable --transient-local @COMMAND_CONCATENATE_COMPOSE@ @COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/content_filter@FILE_EXTENSION@ publisher --samples 15 --interval 100 --reliable --transient-local@COMMAND_BACKGROUND_JOB_COMPOSE@"

‎test/examples/custom_payload_pool.compose.yml

+11-12
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,30 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
version: "3"
1514

1615
services:
1716
subscriber:
1817
image: @DOCKER_IMAGE_NAME@
1918
volumes:
20-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
21-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
19+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
20+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
21+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
2222
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2323
environment:
24-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
25-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
26-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/custom_payload_pool
24+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
25+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/custom_payload_pool/@EXAMPLE_SUFFIX_DIR_COMPOSE@
2726
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/custom_payload_pool@FILE_EXTENSION@ subscriber --samples 10"
2827

2928
publisher:
3029
image: @DOCKER_IMAGE_NAME@
3130
volumes:
32-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
33-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
31+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
32+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
33+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
3434
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
3535
environment:
36-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
37-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
38-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/custom_payload_pool
39-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/custom_payload_pool@FILE_EXTENSION@ publisher --samples 10"
36+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
37+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/custom_payload_pool/@EXAMPLE_SUFFIX_DIR_COMPOSE@
38+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/custom_payload_pool@FILE_EXTENSION@ publisher --samples 10"
4039
depends_on:
4140
- subscriber

‎test/examples/delivery_mechanisms.compose.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,50 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
version: "3"
1514

1615
services:
1716
subscriber:
1817
image: @DOCKER_IMAGE_NAME@
1918
volumes:
20-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
21-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
19+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
20+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
21+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
2222
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2323
environment:
24-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
25-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
26-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/delivery_mechanisms
24+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
25+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
2726
ISOLATED_SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${ISUB_ARGS}
2827
# avoid ipc host to isolate this subscriber for sharing memory with other containers
2928
network_mode: host
30-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${ISOLATED_SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
29+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${ISOLATED_SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
3130

3231
publisher-subscriber:
3332
image: @DOCKER_IMAGE_NAME@
3433
volumes:
35-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
36-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
34+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
35+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
36+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
3737
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
3838
environment:
39-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
40-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
41-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/delivery_mechanisms
39+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
40+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
4241
PUBLISHER_ADDITIONAL_ARGUMENTS: ${PUB_ARGS}
4342
SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${SUB_ARGS}
4443
network_mode: host
4544
ipc: host
46-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ publisher --samples 10 $${PUBLISHER_ADDITIONAL_ARGUMENTS} & $${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
45+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ publisher --samples 10 $${PUBLISHER_ADDITIONAL_ARGUMENTS} @COMMAND_CONCATENATE_COMPOSE@ @COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS}@COMMAND_BACKGROUND_JOB_COMPOSE@"
4746

4847
pubsub:
4948
image: @DOCKER_IMAGE_NAME@
5049
volumes:
51-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
52-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
50+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
51+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
52+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
5353
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
5454
environment:
55-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
56-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
57-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/delivery_mechanisms
55+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
56+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
5857
PUBSUB_ADDITIONAL_ARGUMENTS: ${PUBSUB_ARGS}
5958
network_mode: host
6059
ipc: host
61-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ pubsub --samples 10 $${PUBSUB_ADDITIONAL_ARGUMENTS}"
60+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ pubsub --samples 10 $${PUBSUB_ADDITIONAL_ARGUMENTS}"

‎test/examples/delivery_mechanisms_isolated.compose.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -11,60 +11,59 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
version: "3"
1514

1615
services:
1716
subscriber:
1817
image: @DOCKER_IMAGE_NAME@
1918
volumes:
20-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
21-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
19+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
20+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
21+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
2222
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2323
environment:
24-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
25-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
26-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/delivery_mechanisms
24+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
25+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
2726
ISOLATED_SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${ISUB_ARGS}
2827
# avoid network and ipc host to isolate this subscriber for sharing memory with other containers
2928
networks:
3029
delivery_mechanisms_net:
3130
ipv4_address: 113.1.1.2
32-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${ISOLATED_SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
31+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${ISOLATED_SUBSCRIBER_ADDITIONAL_ARGUMENTS}"
3332

3433
publisher-subscriber:
3534
image: @DOCKER_IMAGE_NAME@
3635
volumes:
37-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
38-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
36+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
37+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
38+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
3939
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
4040
environment:
41-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
42-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
43-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/delivery_mechanisms
41+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
42+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
4443
PUBLISHER_ADDITIONAL_ARGUMENTS: ${PUB_ARGS}
4544
SUBSCRIBER_ADDITIONAL_ARGUMENTS: ${SUB_ARGS}
4645
# avoid network and ipc host to isolate this subscriber for sharing memory with other containers
4746
networks:
4847
delivery_mechanisms_net:
4948
ipv4_address: 113.1.1.3
50-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS} & $${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ publisher --samples 10 $${PUBLISHER_ADDITIONAL_ARGUMENTS}"
49+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ subscriber --samples 10 $${SUBSCRIBER_ADDITIONAL_ARGUMENTS} @COMMAND_CONCATENATE_COMPOSE@ @COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ publisher --samples 10 $${PUBLISHER_ADDITIONAL_ARGUMENTS}@COMMAND_BACKGROUND_JOB_COMPOSE@"
5150

5251
pubsub:
5352
image: @DOCKER_IMAGE_NAME@
5453
volumes:
55-
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
56-
- @fastcdr_LIB_DIR@:@fastcdr_LIB_DIR@
54+
- @PROJECT_BINARY_DIR_COMPOSE_VOLUME@
55+
- @fastcdr_LIB_DIR_COMPOSE_VOLUME@
56+
- @CMAKE_INSTALL_PREFIX_COMPOSE_VOLUME@
5757
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
5858
environment:
59-
# TODO(eduponz): LD_LIBRARY_PATH is not the correct variable for Windows
60-
LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
61-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/delivery_mechanisms
59+
@PATH_ENVIRONMENT_VARIABLE_COMPOSE@
60+
EXAMPLE_DIR: @EXAMPLE_PREFIX_DIR_COMPOSE@/delivery_mechanisms/@EXAMPLE_SUFFIX_DIR_COMPOSE@
6261
PUBSUB_ADDITIONAL_ARGUMENTS: ${PUBSUB_ARGS}
6362
# avoid network and ipc host to isolate this subscriber for sharing memory with other containers
6463
networks:
6564
delivery_mechanisms_net:
6665
ipv4_address: 113.1.1.4
67-
command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/delivery_mechanisms@FILE_EXTENSION@ pubsub --samples 10 $${PUBSUB_ADDITIONAL_ARGUMENTS}"
66+
command: @SHELL_EXECUTABLE@ -c "@COMMAND_EXAMPLE_DIR_PREFIX_COMPOSE@/delivery_mechanisms@FILE_EXTENSION@ pubsub --samples 10 $${PUBSUB_ADDITIONAL_ARGUMENTS}"
6867

6968
networks:
7069
delivery_mechanisms_net:

0 commit comments

Comments
 (0)