From 8f326af3a9bb43bb4e44abf8c5d7de49d2554688 Mon Sep 17 00:00:00 2001 From: tisihara Date: Thu, 5 Dec 2024 18:42:37 +0900 Subject: [PATCH] fix docker compose to load cyclonedds config file in production image DCO 1.1 Signed-off-by: Tatsuya Ishihara --- docker-compose-bag.yaml | 1 + docker-compose-common.yaml | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/docker-compose-bag.yaml b/docker-compose-bag.yaml index 14a2f9b2..29332513 100644 --- a/docker-compose-bag.yaml +++ b/docker-compose-bag.yaml @@ -64,6 +64,7 @@ services: file: docker-compose-common.yaml service: bag volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros - ${CABOT_BAG_MOUNT:-./doc}:/ros2_topics profiles: diff --git a/docker-compose-common.yaml b/docker-compose-common.yaml index cf089e47..5921b7cd 100644 --- a/docker-compose-common.yaml +++ b/docker-compose-common.yaml @@ -31,6 +31,7 @@ services: file: cabot-navigation/docker-compose-common.yaml service: navigation-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros navigation-dev: @@ -45,6 +46,7 @@ services: file: cabot-navigation/docker-compose-common.yaml service: navigation-prod-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros gazebo-dev: @@ -59,6 +61,7 @@ services: file: cabot-navigation/docker-compose-common.yaml service: gazebo-prod-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros gui-dev: @@ -73,6 +76,7 @@ services: file: cabot-navigation/docker-compose-common.yaml service: gui-prod-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros localization-dev: @@ -87,6 +91,7 @@ services: file: cabot-navigation/docker-compose-common.yaml service: localization-prod-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros driver-dev: @@ -101,6 +106,7 @@ services: file: cabot-drivers/docker-compose-base.yaml service: driver-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros people-dev: @@ -115,6 +121,7 @@ services: file: cabot-people/docker-compose-base.yaml service: people-all-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros people-detection-dev: @@ -129,6 +136,7 @@ services: file: cabot-people/docker-compose-base.yaml service: people-detection-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros people-track-dev: @@ -143,6 +151,7 @@ services: file: cabot-people/docker-compose-base.yaml service: people-track-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros people-framos-camera-dev: @@ -157,6 +166,7 @@ services: file: cabot-people/docker-compose-base.yaml service: people-framos-camera-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros people-framos-detection-dev: @@ -171,6 +181,7 @@ services: file: cabot-people/docker-compose-base.yaml service: people-framos-detection-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros people-nuc-dev: @@ -185,6 +196,7 @@ services: file: cabot-people/docker-compose-base.yaml service: people-nuc-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros wifi_scan-dev: @@ -199,6 +211,7 @@ services: file: cabot-drivers/docker-compose-base.yaml service: wifi_scan-prod-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros ble_scan-dev: @@ -213,6 +226,7 @@ services: file: cabot-drivers/docker-compose-base.yaml service: ble_scan-prod-base volumes: + - ./docker/home/cyclonedds_spdp.xml:/home/developer/cyclonedds_spdp.xml - ./docker/home/.ros:/home/developer/.ros bag: