Added usb cam and volume for docker container ws_linux
This commit is contained in:
parent
b579744d80
commit
b984ebf9dc
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "Legacy/ws_linux/src/usb_cam"]
|
||||
path = Legacy/ws_linux/src/usb_cam
|
||||
url = https://github.com/ros-drivers/usb_cam
|
@ -1,8 +1,7 @@
|
||||
FROM irth7/ros:hydro as build
|
||||
|
||||
RUN sed -i 's/archive.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list && cat /etc/apt/sources.list
|
||||
RUN apt-get update && apt-get install -y ros-hydro-tf ros-hydro-dynamic-reconfigure ros-hydro-nav-msgs ros-hydro-hokuyo-node
|
||||
COPY ws_linux /home/lab1_5/ws/ws_linux
|
||||
RUN apt-get update && apt-get install -y ros-hydro-tf ros-hydro-dynamic-reconfigure ros-hydro-nav-msgs ros-hydro-hokuyo-node v4l-utils python-catkin-tools ffmpeg
|
||||
ADD Aria /usr/local/Aria
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
|
||||
|
@ -24,3 +24,4 @@ set -x
|
||||
|
||||
rosrun rosaria RosAria _port:=$ARIA_PORT _tf_prefix:=PIONIER${PIONIER_ID} &
|
||||
rosrun hokuyo_node hokuyo_node _frame_id:="${ROS_NAMESPACE}/laser"
|
||||
rosrun usb_cam usb_cam_node
|
||||
|
1
Legacy/ws_linux/src/usb_cam
Submodule
1
Legacy/ws_linux/src/usb_cam
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 3ce8ee1c47c03be37229bf5857ae9a309d8eb1e8
|
@ -7,6 +7,9 @@ fi
|
||||
|
||||
cp rosaria-docker.service /etc/systemd/system/
|
||||
chmod g+w /etc/systemd/system/rosaria-docker.service
|
||||
|
||||
git submodule init
|
||||
git submodule update
|
||||
systemctl daemon-reload
|
||||
systemctl enable rosaria-docker.service
|
||||
systemctl start rosaria-docker.service
|
||||
|
5
run.sh
5
run.sh
@ -2,5 +2,6 @@
|
||||
# Script running rosaria inside docker container
|
||||
echo "ID: $PIONIER_ID"
|
||||
|
||||
docker run --privileged --network=host --device=/dev/ttyS0 -i -e ROS_IP=$(hostname -I | awk '{print $1}') -e PIONIER_ID=$(hostname | sed 's/[^0-9]//g'
|
||||
) irth7/rosaria-legacy
|
||||
docker run --privileged --network=host --device=/dev/ttyS0 -i -e ROS_IP=$(hostname -I | awk '{print $1}') -e PIONIER_ID=$(hostname | sed 's/[^0-9]//g')\
|
||||
--mount type=bind,source=/home/lab1_5/rosaria/Legacy/ws_linux,target=/home/lab1_5/ws/ws_linux irth7/rosaria-legacy
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user