Skip to content

Commit

Permalink
Merge release/k900-xil branch into master (#256)
Browse files Browse the repository at this point in the history
  • Loading branch information
codygarver authored Jun 20, 2023
2 parents 1edf942 + 7264c09 commit 392545a
Show file tree
Hide file tree
Showing 28 changed files with 433 additions and 166 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
web-ui:
image: usdotfhwastol/carma-web-ui:carma-system-4.4.0
image: usdotfhwastol/carma-web-ui:carma-system-4.4.2
network_mode: host
container_name: web-ui
environment:
Expand Down
14 changes: 7 additions & 7 deletions chrysler_pacifica_ehybrid_s_2019/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
roscore:
image: usdotfhwastol/carma-base:carma-system-4.4.0
image: usdotfhwastol/carma-base:carma-system-4.4.2
network_mode: host
container_name: roscore
volumes_from:
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
command: bash -c 'source /opt/carma/install_ros2/setup.bash && ros2 launch /opt/carma/vehicle/config/carma_docker.launch.py'

ros1_bridge:
image: usdotfhwastol/carma-msgs:carma-system-4.4.0
image: usdotfhwastol/carma-msgs:carma-system-4.4.2
network_mode: host
container_name: ros1_bridge
volumes_from:
Expand All @@ -83,7 +83,7 @@ services:
command: bash -c 'wait-for-it.sh localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'

lightbar-driver:
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.2
network_mode: host
container_name: lightbar-driver
volumes_from:
Expand All @@ -97,7 +97,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=lightbar_driver'

cohda_dsrc_driver:
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.0
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.2
container_name: carma-cohda-dsrc-driver
network_mode: host
volumes_from:
Expand All @@ -108,7 +108,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=dsrc_driver'

ssc_controller_driver:
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.2
container_name: ssc_controller_driver
network_mode: host
privileged: true # Grant access to usb for can data
Expand All @@ -123,7 +123,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=ssc_interface_wrapper'

novatel_gnss_imu_driver:
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.2
container_name: carma-novatel-oem7-driver-wrapper
network_mode: host
volumes_from:
Expand All @@ -135,7 +135,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=carma_novatel_driver_wrapper'

velodyne_lidar_driver:
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.2
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand Down
2 changes: 1 addition & 1 deletion development/docker-compose-background.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
web-ui:
image: usdotfhwastol/carma-web-ui:carma-system-4.4.0
image: usdotfhwastol/carma-web-ui:carma-system-4.4.2
network_mode: host
container_name: carma-web-ui
environment:
Expand Down
4 changes: 2 additions & 2 deletions development/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
roscore:
image: usdotfhwastol/carma-base:carma-system-4.4.0
image: usdotfhwastol/carma-base:carma-system-4.4.2
network_mode: host
container_name: roscore
volumes_from:
Expand Down Expand Up @@ -64,7 +64,7 @@ services:
command: bash -c 'source /opt/carma/install_ros2/setup.bash && ros2 launch /opt/carma/vehicle/config/carma_docker.launch.py'

ros1_bridge:
image: usdotfhwastol/carma-msgs:carma-system-4.4.0
image: usdotfhwastol/carma-msgs:carma-system-4.4.2
network_mode: host
container_name: ros1_bridge
volumes_from:
Expand Down
2 changes: 1 addition & 1 deletion ford_fusion_sehybrid_2019/docker-compose-background.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
web-ui:
image: usdotfhwastol/carma-web-ui:carma-system-4.4.0
image: usdotfhwastol/carma-web-ui:carma-system-4.4.2
network_mode: host
container_name: web-ui
environment:
Expand Down
14 changes: 7 additions & 7 deletions ford_fusion_sehybrid_2019/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
roscore:
image: usdotfhwastol/carma-base:carma-system-4.4.0
image: usdotfhwastol/carma-base:carma-system-4.4.2
network_mode: host
container_name: roscore
volumes_from:
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
command: bash -c 'source /opt/carma/install_ros2/setup.bash && ros2 launch /opt/carma/vehicle/config/carma_docker.launch.py'

ros1_bridge:
image: usdotfhwastol/carma-msgs:carma-system-4.4.0
image: usdotfhwastol/carma-msgs:carma-system-4.4.2
network_mode: host
container_name: ros1_bridge
volumes_from:
Expand All @@ -86,7 +86,7 @@ services:
command: bash -c 'wait-for-it.sh localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'

lightbar-driver:
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.2
network_mode: host
container_name: lightbar-driver
volumes_from:
Expand All @@ -100,7 +100,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=lightbar_driver'

cohda_dsrc_driver:
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.0
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.2
container_name: carma-cohda-dsrc-driver
network_mode: host
volumes_from:
Expand All @@ -114,7 +114,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=dsrc_driver'

ssc_controller_driver:
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.2
container_name: ssc_controller_driver
network_mode: host
privileged: true # Grant access to usb for can data
Expand All @@ -131,7 +131,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=ssc_interface_wrapper'

novatel_gnss_imu_driver:
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.2
container_name: carma-novatel-oem7-driver-wrapper
network_mode: host
volumes_from:
Expand All @@ -145,7 +145,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=carma_novatel_driver_wrapper'

velodyne_lidar_driver:
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.2
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
web-ui:
image: usdotfhwastol/carma-web-ui:carma-system-4.4.0
image: usdotfhwastol/carma-web-ui:carma-system-4.4.2
network_mode: host
container_name: web-ui
environment:
Expand Down
16 changes: 8 additions & 8 deletions freightliner_cascadia_2012_dot_10002/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
roscore:
image: usdotfhwastol/carma-base:carma-system-4.4.0
image: usdotfhwastol/carma-base:carma-system-4.4.2
network_mode: host
container_name: roscore
volumes_from:
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
command: bash -c 'source /opt/carma/install_ros2/setup.bash && ros2 launch /opt/carma/vehicle/config/carma_docker.launch.py'

ros1_bridge:
image: usdotfhwastol/carma-msgs:carma-system-4.4.0
image: usdotfhwastol/carma-msgs:carma-system-4.4.2
network_mode: host
container_name: ros1_bridge
volumes_from:
Expand Down Expand Up @@ -100,7 +100,7 @@ services:
command: wait-for-it.sh localhost:11311 -- roslaunch truck_inspection_client truck_inspection_client.launch truck_inspection_client_param_file:=/opt/carma/vehicle/calibration/truck_inspection_client/parameters.yaml

lightbar-driver:
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.2
network_mode: host
container_name: lightbar-driver
volumes_from:
Expand All @@ -114,7 +114,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=lightbar_driver'

cohda_dsrc_driver:
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.0
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.2
container_name: carma-cohda-dsrc-driver
network_mode: host
volumes_from:
Expand All @@ -125,7 +125,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=dsrc_driver'

ssc_controller_driver:
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.2
container_name: ssc_controller_driver
network_mode: host
privileged: true # Grant access to kvaser
Expand All @@ -140,7 +140,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=ssc_interface_wrapper'

novatel_gnss_imu_driver:
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.2
container_name: carma-novatel-oem7-driver-wrapper
network_mode: host
volumes_from:
Expand All @@ -152,7 +152,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=carma_novatel_driver_wrapper'

velodyne_lidar_driver:
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.2
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand All @@ -176,7 +176,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=velodyne_lidar_driver_wrapper'

lidar_lite_trailer_angle_driver:
image: usdotfhwastol/carma-garmin-lidar-lite-v3-driver-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-garmin-lidar-lite-v3-driver-wrapper:carma-system-4.4.2
container_name: lidar_lite_trailer_angle_driver
network_mode: host
privileged: true # Grant access to usb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
web-ui:
image: usdotfhwastol/carma-web-ui:carma-system-4.4.0
image: usdotfhwastol/carma-web-ui:carma-system-4.4.2
network_mode: host
container_name: web-ui
environment:
Expand Down
16 changes: 8 additions & 8 deletions freightliner_cascadia_2012_dot_10003/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
roscore:
image: usdotfhwastol/carma-base:carma-system-4.4.0
image: usdotfhwastol/carma-base:carma-system-4.4.2
network_mode: host
container_name: roscore
volumes_from:
Expand Down Expand Up @@ -65,7 +65,7 @@ services:
command: bash -c 'source /opt/carma/install_ros2/setup.bash && ros2 launch /opt/carma/vehicle/config/carma_docker.launch.py'

ros1_bridge:
image: usdotfhwastol/carma-msgs:carma-system-4.4.0
image: usdotfhwastol/carma-msgs:carma-system-4.4.2
network_mode: host
container_name: ros1_bridge
volumes_from:
Expand Down Expand Up @@ -100,7 +100,7 @@ services:
command: wait-for-it.sh localhost:11311 -- roslaunch truck_inspection_client truck_inspection_client.launch truck_inspection_client_param_file:=/opt/carma/vehicle/calibration/truck_inspection_client/parameters.yaml

lightbar-driver:
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.4.2
network_mode: host
container_name: lightbar-driver
volumes_from:
Expand All @@ -114,7 +114,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=lightbar_driver'

cohda_dsrc_driver:
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.0
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.4.2
container_name: carma-cohda-dsrc-driver
network_mode: host
volumes_from:
Expand All @@ -125,7 +125,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=dsrc_driver'

ssc_controller_driver:
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.4.2
container_name: ssc_controller_driver
network_mode: host
privileged: true # Grant access to kvaser
Expand All @@ -140,7 +140,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=ssc_interface_wrapper'

novatel_gnss_imu_driver:
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.4.2
container_name: carma-novatel-oem7-driver-wrapper
network_mode: host
volumes_from:
Expand All @@ -152,7 +152,7 @@ services:
command: bash -c 'source /opt/carma/install/setup.bash && ros2 launch /opt/carma/vehicle/config/drivers.launch.py drivers:=carma_novatel_driver_wrapper'

velodyne_lidar_driver:
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.0
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.4.2
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand All @@ -176,7 +176,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch drivers:=velodyne_lidar_driver_wrapper'

lidar_lite_trailer_angle_driver:
image: usdotfhwastol/carma-garmin-lidar-lite-v3-driver-wrapper:carma-system-4.4.0
image: usdotfhwastol/carma-garmin-lidar-lite-v3-driver-wrapper:carma-system-4.4.2
container_name: lidar_lite_trailer_angle_driver
network_mode: host
privileged: true # Grant access to usb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version: '2'

services:
web-ui:
image: usdotfhwastol/carma-web-ui:carma-system-4.4.0
image: usdotfhwastol/carma-web-ui:carma-system-4.4.2
network_mode: host
container_name: web-ui
environment:
Expand Down
Loading

0 comments on commit 392545a

Please sign in to comment.