Skip to content

Commit

Permalink
Update version numbers to 4.5.0 (#337)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
[CARMA Contributing
Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@MishkaMN
  • Loading branch information
paulbourelly999 authored Apr 10, 2024
1 parent fac1591 commit b212af6
Show file tree
Hide file tree
Showing 25 changed files with 175 additions and 200 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/dockerhub.yml

This file was deleted.

4 changes: 2 additions & 2 deletions ail_vru_uc1_scenario/cdasim_config/stop_simulation
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# Prunes all Kafka related volumes
if ! [ -f /opt/carma-streets/scripts/collect_kafka_logs.py ] ; then
echo "Installing collect_kafka_logs.py into /opt/carma-streets/scripts/ ...."
wget -q https://raw.githubusercontent.com/usdot-fhwa-stol/carma-streets/release/lavida/collect_kafka_logs.py -P /opt/carma-streets/scripts
wget -q https://raw.githubusercontent.com/usdot-fhwa-stol/carma-streets/master/collect_kafka_logs.py -P /opt/carma-streets/scripts
sudo chmod 777 /opt/carma-streets/scripts/collect_kafka_logs.py
fi
if ! [ -f /opt/carma-simulation/scripts/extract_rtf_data ] ; then
echo "Installing extract_rtf_data into /opt/carma-simulation/scripts/ ...."
wget -q https://raw.githubusercontent.com/usdot-fhwa-stol/carma-analytics-fotda/release/lavida/vru_use_case_scripts/extract_rtf_data -P /opt/carma-simulation/scripts
wget -q https://raw.githubusercontent.com/usdot-fhwa-stol/carma-analytics-fotda/master/vru_use_case_scripts/extract_rtf_data -P /opt/carma-simulation/scripts
sudo chmod 777 /opt/carma-simulation/scripts/extract_rtf_data
fi
filename=carma_streets_kafka_"$(date +%F_%H-%M-%S)"
Expand Down
30 changes: 15 additions & 15 deletions ail_vru_uc1_scenario/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2"
services:
carma-simulation:
privileged: true
image: usdotfhwastolcandidate/cdasim:lavida
image: usdotfhwastol/cdasim:carma-system-4.5.0
networks:
carma_sim_net:
ipv4_address: 172.2.0.2
Expand All @@ -24,7 +24,7 @@ services:

## carma_1 vehicle
roscore_1:
image: usdotfhwastolcandidate/carma-base:lavida
image: usdotfhwastol/carma-base:carma-system-4.5.0
networks:
carma_net_1:
ipv4_address: 172.3.0.2
Expand All @@ -41,7 +41,7 @@ services:
command: roscore

platform_1:
image: usdotfhwastolcandidate/carma-platform:lavida
image: usdotfhwastol/carma-platform:carma-system-4.5.0
networks:
carma_net_1:
ipv4_address: 172.3.0.3
Expand All @@ -65,7 +65,7 @@ services:
&& wait-for-it.sh 172.3.0.2:11311 -- roslaunch /opt/carma/vehicle/config/carma_docker.launch'
platform_ros2_1:
image: usdotfhwastolcandidate/carma-platform:lavida
image: usdotfhwastol/carma-platform:carma-system-4.5.0
networks:
carma_net_1:
ipv4_address: 172.3.0.4
Expand All @@ -89,7 +89,7 @@ services:
&& ros2 launch /opt/carma/vehicle/config/carma_docker.launch.py'
ros1_bridge_1:
image: usdotfhwastolcandidate/carma-msgs:lavida
image: usdotfhwastol/carma-msgs:carma-system-4.5.0
networks:
carma_net_1:
ipv4_address: 172.3.0.5
Expand All @@ -113,7 +113,7 @@ services:
&& ros2 run ros1_bridge dynamic_bridge --multi-threads'
carma-carla-integration_1:
image: usdotfhwastolcandidate/carma-carla-integration:lavida
image: usdotfhwastol/carma-carla-integration:carma-system-4.5.0
networks:
carma_net_1:
ipv4_address: 172.3.0.6
Expand Down Expand Up @@ -146,7 +146,7 @@ services:
spawn_point:=${VEHICLE_SPAWN_POINT}"
ns3_adapter_1:
image: usdotfhwastolcandidate/carma-ns3-adapter:lavida
image: usdotfhwastol/carma-ns3-adapter:carma-system-4.5.0
networks:
carma_net_1:
ipv4_address: 172.3.0.7
Expand Down Expand Up @@ -256,7 +256,7 @@ services:
- ./mysql:/docker-entrypoint-initdb.d

php:
image: usdotfhwaops/php:lavida
image: usdotfhwaops/php:carma-system-4.5.0
container_name: php
network_mode: service:db
depends_on:
Expand All @@ -265,7 +265,7 @@ services:
tty: true

v2xhub:
image: usdotfhwaops/v2xhubamd:lavida
image: usdotfhwaops/v2xhubamd:carma-system-4.5.0
container_name: v2xhub
network_mode: service:db
restart: always
Expand All @@ -291,7 +291,7 @@ services:
- ./sensor_configurations:/home/V2X-Hub/sensor_configurations/

intersection_model:
image: usdotfhwastolcandidate/intersection_model:lavida
image: usdotfhwastol/intersection_model:carma-system-4.5.0
container_name: intersection_model
restart: always
network_mode: service:zookeeper
Expand All @@ -306,7 +306,7 @@ services:
- ./MAP:/home/carma-streets/intersection_model/MAP

carla-sensor-lib:
image: usdotfhwastolcandidate/carla-sensor-lib:lavida
image: usdotfhwastol/carla-sensor-lib:carma-system-4.5.0
networks:
carma_sim_net:
ipv4_address: 172.2.0.5
Expand All @@ -322,7 +322,7 @@ services:
python3 -u /home/CarlaCDASimAdapter/src/CarlaCDASimAdapter.py --carla-host 172.2.0.2 --xmlrpc-server-host 172.2.0.5 --sensor-config-file ./config/simulated_sensor_config.yaml --noise-model-config-file ./config/noise_model_config.yaml"

tsc_service:
image: usdotfhwastolcandidate/tsc_service:lavida
image: usdotfhwastol/tsc_service:carma-system-4.5.0
container_name: tsc_service
restart: always
network_mode: service:zookeeper
Expand Down Expand Up @@ -351,7 +351,7 @@ services:
sh -c "/wait
&& /home/carma-streets/tsc_client_service/build/traffic_signal_controller_service"
sensor_data_sharing_service:
image: usdotfhwastolcandidate/sensor_data_sharing_service:lavida
image: usdotfhwastol/sensor_data_sharing_service:carma-system-4.5.0
build:
context: .
dockerfile: sensor_data_sharing_service/Dockerfile
Expand All @@ -377,7 +377,7 @@ services:
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
econolite-virtual-controller:
image: usdotfhwastoldev/econolite-virtual-controller:develop
image: usdotfhwastol/econolite-virtual-controller:carma-system-4.5.0
container_name: evc
restart: always
networks:
Expand All @@ -399,7 +399,7 @@ services:
--traci-ip 172.2.0.2"
scenario-runner:
image: usdotfhwastolcandidate/scenario-runner:lavida
image: usdotfhwastol/scenario-runner:carma-system-4.5.0
container_name: scenario-runner
networks:
- carma_sim_net
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.2.0
image: usdotfhwastol/carma-web-ui:carma-system-4.5.0
network_mode: host
container_name: web-ui
environment:
Expand Down
8 changes: 4 additions & 4 deletions carla_ground_truth_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-4.2.0
image: usdotfhwastol/carma-base:carma-system-4.5.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-4.2.0
image: usdotfhwastol/carma-platform:carma-system-4.5.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 simulation_mode:="true" '

platform_ros2:
image: usdotfhwastol/carma-platform:carma-system-4.2.0
image: usdotfhwastol/carma-platform:carma-system-4.5.0
network_mode: host
container_name: platform_ros2
volumes_from:
Expand All @@ -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.2.0
image: usdotfhwastol/carma-msgs:carma-system-4.5.0
network_mode: host
container_name: ros1_bridge
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: usdotfhwastolcandidate/carma-web-ui:lavida
image: usdotfhwastol/carma-web-ui:carma-system-4.5.0
network_mode: host
container_name: web-ui
environment:
Expand Down
20 changes: 10 additions & 10 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: usdotfhwastolcandidate/carma-base:lavida
image: usdotfhwastol/carma-base:carma-system-4.5.0
network_mode: host
container_name: roscore
volumes_from:
Expand All @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastolcandidate/carma-platform:lavida
image: usdotfhwastol/carma-platform:carma-system-4.5.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'

platform_ros2:
image: usdotfhwastolcandidate/carma-platform:lavida
image: usdotfhwastol/carma-platform:carma-system-4.5.0
network_mode: host
container_name: platform_ros2
volumes_from:
Expand All @@ -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: usdotfhwastolcandidate/carma-msgs:lavida
image: usdotfhwastol/carma-msgs:carma-system-4.5.0
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: usdotfhwastolcandidate/carma-lightbar-driver:lavida
image: usdotfhwastol/carma-lightbar-driver:carma-system-4.5.0
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: usdotfhwastolcandidate/carma-cohda-dsrc-driver:lavida
image: usdotfhwastol/carma-cohda-dsrc-driver:carma-system-4.5.0
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: usdotfhwastolcandidate/carma-ssc-interface-wrapper:lavida
image: usdotfhwastol/carma-ssc-interface-wrapper:carma-system-4.5.0
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: usdotfhwastolcandidate/carma-novatel-oem7-driver-wrapper:lavida
image: usdotfhwastol/carma-novatel-oem7-driver-wrapper:carma-system-4.5.0
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: usdotfhwastolcandidate/carma-velodyne-lidar-driver:lavida
image: usdotfhwastol/carma-velodyne-lidar-driver:carma-system-4.5.0
container_name: velodyne-lidar-driver
network_mode: host
volumes_from:
Expand All @@ -149,7 +149,7 @@ services:
# It is being used instead as camera input is currently not supported in the Autoware.Auto
# system integrated in release carma-system-4.0
mock-camera-driver:
image: usdotfhwastolcandidate/carma-platform:lavida
image: usdotfhwastol/carma-platform:carma-system-4.5.0
network_mode: host
container_name: carma-mock-camera-driver
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: usdotfhwastolcandidate/carma-web-ui:lavida
image: usdotfhwastol/carma-web-ui:carma-system-4.5.0
network_mode: host
container_name: carma-web-ui
environment:
Expand Down
Loading

0 comments on commit b212af6

Please sign in to comment.