Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
Signed-off-by: Oguz Ozturk <[email protected]>
  • Loading branch information
oguzkaganozt committed Nov 25, 2024
1 parent 92f4a2a commit 6717bb6
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 26 deletions.
44 changes: 22 additions & 22 deletions docker/local-simulation.docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
simulator:
image: ghcr.io/autowarefoundation/autoware_snapshots:simulator-visualizer-amd64
image: ghcr.io/autowarefoundation/demo_packages:simulator-visualizer-amd64
network_mode: "host"
volumes:
- /dev/shm:/dev/shm
Expand All @@ -24,26 +24,26 @@ services:
map_path:=/autoware/map
global_timeout:=240
initialize_duration:=90
launch_autoware:=false
launch_autoware:=true
launch_rviz:=true
planning-control:
image: ghcr.io/autowarefoundation/autoware:universe
network_mode: "host"
volumes:
- /dev/shm:/dev/shm
- /etc/localtime:/etc/localtime:ro
- ./etc/map:/autoware/map
environment:
- ROS_DOMAIN_ID=88
command: >-
ros2 launch
autoware_launch
planning_simulator.launch.xml
scenario_simulation:=true
vehicle_model:=sample_vehicle
sensor_model:=sample_sensor_kit
map_path:=/autoware/map
use_foa:=false
perception/enable_traffic_light:=false
rviz:=false
# planning-control:
# image: ghcr.io/autowarefoundation/demo_packages:planning-control-pass-amd64
# network_mode: "host"
# volumes:
# - /dev/shm:/dev/shm
# - /etc/localtime:/etc/localtime:ro
# - ./etc/map:/autoware/map
# environment:
# - ROS_DOMAIN_ID=88
# command: >-
# ros2 launch
# autoware_launch
# planning_simulator.launch.xml
# scenario_simulation:=true
# vehicle_model:=sample_vehicle
# sensor_model:=sample_sensor_kit
# map_path:=/autoware/map
# use_foa:=false
# perception/enable_traffic_light:=false
# rviz:=false
2 changes: 1 addition & 1 deletion docker/planning-control/fail/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/autowarefoundation/autoware:universe AS planning-control-fail
FROM ghcr.io/autowarefoundation/autoware:universe-20240927 AS planning-control-fail

# Copy launch file
COPY docker/planning-control/fail/fail_scenario.launch.xml /opt/autoware/share/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/static_obstacle_avoidance.param.yaml
Expand Down
2 changes: 1 addition & 1 deletion docker/planning-control/pass/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/autowarefoundation/autoware:universe AS planning-control-pass
FROM ghcr.io/autowarefoundation/autoware:universe-20240927 AS planning-control-pass

# Copy launch file
COPY docker/planning-control/pass/pass_scenario.launch.xml /opt/autoware/share/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/static_obstacle_avoidance.param.yaml
Expand Down
1 change: 1 addition & 0 deletions docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@ run_simulation() {
fi
}

xhost +
parse_arguments "$@"
run_simulation
4 changes: 2 additions & 2 deletions docker/simulator-visualizer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/autowarefoundation/autoware:universe-devel AS builder
FROM ghcr.io/autowarefoundation/autoware:universe-devel-20240927 AS builder
WORKDIR /autoware

# Copy scenario_simulator and pull external dependencies
Expand Down Expand Up @@ -28,7 +28,7 @@ RUN source /opt/ros/"$ROS_DISTRO"/setup.bash \
RUN find /opt/autoware/lib -type f -name "*.py" -exec chmod +x {} \;
RUN find /opt/autoware/share -type f -name "*.py" -exec chmod +x {} \;

FROM ghcr.io/autowarefoundation/autoware:universe as simulator-visualizer
FROM ghcr.io/autowarefoundation/autoware:universe-20240927 as simulator-visualizer

Check warning on line 31 in docker/simulator-visualizer/Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build-and-push

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY --from=builder /opt/autoware /opt/autoware
COPY --from=builder /autoware /autoware
Expand Down

0 comments on commit 6717bb6

Please sign in to comment.