Skip to content

Commit

Permalink
Merge pull request #128 from UOA-FSAE/zed_update_sdk_docker
Browse files Browse the repository at this point in the history
Zed update sdk docker
  • Loading branch information
Tanish29 authored Aug 15, 2024
2 parents 8c24d6c + a25da3d commit afcc0d2
Showing 3 changed files with 37 additions and 39 deletions.
72 changes: 35 additions & 37 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ services:
ipc: host
stdin_open: true
tty: true
# runtime: nvidia
runtime: nvidia
deploy:
resources:
reservations:
@@ -29,40 +29,38 @@ services:
devices:
- /dev:/dev

# autonomous_zed:
# image: zed_sdk
# build:
# context: ..
# dockerfile: .devcontainer/zed.Dockerfile
# environment:
# - DISPLAY
# - NVIDIA_VISIBLE_DEVICES=all
# - NVIDIA_DRIVER_CAPABILITIES=all
# - ROS_DOMAIN_ID=47
# volumes:
# #- ..:/ws
# #- ../src:/ws/src
# - ../bringup:/ws/bringup
# - ../src/visualization/:/ws/src/visualization/
# - ../src/moa/moa_description:/ws/src/moa/moa_description
# - ../src/moa/moa_msgs:/ws/src/moa/moa_msgs
# - ../ros_entrypoint.sh:/ws/ros_entrypoint.sh
# - /tmp/.X11-unix:/tmp/.X11-unix
# - /dev:/dev
autonomous_zed:
image: zed_sdk
build:
context: ..
dockerfile: .devcontainer/zed.Dockerfile
environment:
- DISPLAY
- NVIDIA_VISIBLE_DEVICES=all
- NVIDIA_DRIVER_CAPABILITIES=all
- ROS_DOMAIN_ID=47
volumes:
- ../bringup:/ws/bringup
- ../src/visualization/:/ws/src/visualization/
- ../src/moa/moa_description:/ws/src/moa/moa_description
- ../src/moa/moa_msgs:/ws/src/moa/moa_msgs
- ../ros_entrypoint.sh:/ws/ros_entrypoint.sh
- /tmp/.X11-unix:/tmp/.X11-unix
- /dev:/dev

# command: bash -c ". /ws/ros_entrypoint.sh && ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"
# network_mode: host
# ipc: host
# stdin_open: true
# tty: true
# runtime: nvidia
# deploy:
# resources:
# reservations:
# devices:
# - driver: nvidia
# device_ids: []
# capabilities: [gpu]
# privileged: true
# devices:
# - /dev:/dev
command: bash -c ". /ws/ros_entrypoint.sh && ros2 launch zed_wrapper zed_camera.launch.py camera_model:='zed2i'"
network_mode: host
ipc: host
stdin_open: true
tty: true
runtime: nvidia
deploy:
resources:
reservations:
devices:
- driver: nvidia
device_ids: []
capabilities: [gpu]
privileged: true
devices:
- /dev:/dev
2 changes: 1 addition & 1 deletion .devcontainer/zed.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM stereolabs/zed:4.0-devel-cuda12.1-ubuntu22.04
FROM stereolabs/zed:4.1-devel-cuda12.1-ubuntu22.04
LABEL Name=zed_sdk Version=0.0.1

SHELL [ "/bin/bash", "-c" ]
2 changes: 1 addition & 1 deletion .docker_templates/zed.Dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM stereolabs/zed:4.0-devel-cuda12.1-ubuntu22.04
FROM stereolabs/zed:4.1-devel-cuda12.1-ubuntu22.04
LABEL Name=zed_sdk Version=0.0.1

SHELL [ "/bin/bash", "-c" ]

0 comments on commit afcc0d2

Please sign in to comment.