Skip to content

Commit

Permalink
Merge pull request #126 from usdot-fhwa-stol/release/yenko
Browse files Browse the repository at this point in the history
Release/yenko
  • Loading branch information
msmcconnell authored Aug 9, 2021
2 parents 5d25442 + d6470d8 commit aa32ec6
Show file tree
Hide file tree
Showing 18 changed files with 91 additions and 91 deletions.
2 changes: 1 addition & 1 deletion carla_integration/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-3.6.0
image: usdotfhwastol/carma-web-ui:carma-system-3.7.0
network_mode: host
container_name: web-ui
environment:
Expand Down
12 changes: 6 additions & 6 deletions carla_integration/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-3.6.0
image: usdotfhwastol/carma-base:carma-system-3.7.0
network_mode: host
container_name: roscore
volumes_from:
Expand All @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: platform
volumes_from:
Expand All @@ -49,7 +49,7 @@ services:
command: bash -c 'wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma_docker.launch'

carla_ackermann_control:
image: usdotfhwastol/carma-simulation:carma-system-3.6.0
image: usdotfhwastol/carma-simulation:carma-system-3.7.0
container_name: carla-ackermann-control-driver
network_mode: host
volumes_from:
Expand All @@ -62,7 +62,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/drivers.launch'

mock-gnss-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-gnss-driver
volumes_from:
Expand All @@ -75,7 +75,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=gnss'

mock-lidar-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-lidar-driver
volumes_from:
Expand All @@ -85,4 +85,4 @@ services:
- /opt/carma/.ros:/home/carma/.ros
environment:
- ROS_IP=127.0.0.1
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=lidar'
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=lidar'
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-3.6.0
image: usdotfhwastol/carma-web-ui:carma-system-3.7.0
network_mode: host
container_name: web-ui
environment:
Expand Down
16 changes: 8 additions & 8 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-3.6.0
image: usdotfhwastol/carma-base:carma-system-3.7.0
network_mode: host
container_name: roscore
volumes_from:
Expand All @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: platform
runtime: nvidia
Expand All @@ -50,7 +50,7 @@ services:
command: bash -c 'wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma_docker.launch'

lightbar-driver:
image: usdotfhwastol/carma-lightbar-driver:carma-system-3.6.0
image: usdotfhwastol/carma-lightbar-driver:carma-system-3.7.0
network_mode: host
container_name: lightbar-driver
volumes_from:
Expand All @@ -64,7 +64,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-3.6.0
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-3.7.0
container_name: carma-cohda-dsrc-driver
network_mode: host
volumes_from:
Expand All @@ -77,7 +77,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:=dsrc_driver'

ssc_controller_driver:
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-3.6.0
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-3.7.0
container_name: ssc_controller_driver
network_mode: host
privileged: true # Grant access to usb for can data
Expand All @@ -92,7 +92,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-gps-driver:carma-system-3.6.0
image: usdotfhwastol/carma-novatel-gps-driver:carma-system-3.7.0
container_name: novatel-gnss-imu-driver
network_mode: host
volumes_from:
Expand All @@ -105,7 +105,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:=novatel_gps_driver'

velodyne_lidar_driver:
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-3.6.0
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-3.7.0
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand All @@ -118,7 +118,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'

avt_vimba_camera_driver:
image: usdotfhwastol/carma-avt-vimba-driver:carma-system-3.6.0
image: usdotfhwastol/carma-avt-vimba-driver:carma-system-3.7.0
container_name: avt-vimba-camera-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-3.6.0
image: usdotfhwastol/carma-web-ui:carma-system-3.7.0
network_mode: host
container_name: carma-web-ui
environment:
Expand Down
24 changes: 12 additions & 12 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-3.6.0
image: usdotfhwastol/carma-base:carma-system-3.7.0
network_mode: host
container_name: roscore
volumes_from:
Expand All @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: platform
volumes_from:
Expand All @@ -49,7 +49,7 @@ services:
command: bash -c 'wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma_docker.launch'

mock-lightbar-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-lightbar-driver
volumes_from:
Expand All @@ -64,7 +64,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:="lightbar bag_parser"'

mock-can-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-can-driver
volumes_from:
Expand All @@ -78,7 +78,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=can'

mock-comms-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-comms-driver
volumes_from:
Expand All @@ -92,7 +92,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=comms'

mock-controller-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-srx-controller-driver
volumes_from:
Expand All @@ -106,7 +106,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=controller'

mock-radar-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-radar-driver
volumes_from:
Expand All @@ -120,7 +120,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=radar'

mock-gnss-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-gnss-driver
volumes_from:
Expand All @@ -134,7 +134,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=gnss'

mock-imu-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-imu-driver
volumes_from:
Expand All @@ -148,7 +148,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=imu'

mock-lidar-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-lidar-driver
volumes_from:
Expand All @@ -162,7 +162,7 @@ services:
command: bash -c 'export ROS_NAMESPACE=$${CARMA_INTR_NS} && wait-for-it.sh localhost:11311 -- roslaunch carma mock_drivers.launch mock_drivers:=lidar'

mock-camera-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-camera-driver
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 carma mock_drivers.launch mock_drivers:=camera'

mock-roadway-sensor-driver:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: carma-mock-roadway-sensor-driver
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-3.6.0
image: usdotfhwastol/carma-web-ui:carma-system-3.7.0
network_mode: host
container_name: web-ui
environment:
Expand Down
16 changes: 8 additions & 8 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-3.6.0
image: usdotfhwastol/carma-base:carma-system-3.7.0
network_mode: host
container_name: roscore
volumes_from:
Expand All @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.6.0
image: usdotfhwastol/carma-platform:carma-system-3.7.0
network_mode: host
container_name: platform
volumes_from:
Expand All @@ -50,7 +50,7 @@ services:
command: bash -c 'wait-for-it.sh localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma_docker.launch'

lightbar-driver:
image: usdotfhwastol/carma-lightbar-driver:carma-system-3.6.0
image: usdotfhwastol/carma-lightbar-driver:carma-system-3.7.0
network_mode: host
container_name: lightbar-driver
volumes_from:
Expand All @@ -64,7 +64,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-3.6.0
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-3.7.0
container_name: carma-cohda-dsrc-driver
network_mode: host
volumes_from:
Expand All @@ -77,7 +77,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:=dsrc_driver'

ssc_controller_driver:
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-3.6.0
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-3.7.0
container_name: ssc_controller_driver
network_mode: host
privileged: true # Grant access to usb for can data
Expand All @@ -94,7 +94,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-gps-driver:carma-system-3.6.0
image: usdotfhwastol/carma-novatel-gps-driver:carma-system-3.7.0
container_name: novatel-gnss-imu-driver
network_mode: host
volumes_from:
Expand All @@ -107,7 +107,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:=novatel_gps_driver'

velodyne_lidar_driver:
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-3.6.0
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-3.7.0
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand All @@ -120,7 +120,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'

avt_vimba_camera_driver:
image: usdotfhwastol/carma-avt-vimba-driver:carma-system-3.6.0
image: usdotfhwastol/carma-avt-vimba-driver:carma-system-3.7.0
container_name: avt-vimba-camera-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-3.6.0
image: usdotfhwastol/carma-web-ui:carma-system-3.7.0
network_mode: host
container_name: web-ui
environment:
Expand Down
Loading

0 comments on commit aa32ec6

Please sign in to comment.