L1.5/rosaria
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Added usb cam and volume for docker container ws_linux

Browse Source
This commit is contained in:
Your Name 2022-01-19 16:40:44 +00:00
parent b579744d80
commit b984ebf9dc
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View 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

3
Legacy/Dockerfile
View File

@ -1,8 +1,7 @@
FROM irth7/ros:hydro as build 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 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 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
COPY ws_linux /home/lab1_5/ws/ws_linux
ADD Aria /usr/local/Aria ADD Aria /usr/local/Aria
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh

1
Legacy/entrypoint.sh
View File

@ -24,3 +24,4 @@ set -x
rosrun rosaria RosAria _port:=$ARIA_PORT _tf_prefix:=PIONIER${PIONIER_ID} & rosrun rosaria RosAria _port:=$ARIA_PORT _tf_prefix:=PIONIER${PIONIER_ID} &
rosrun hokuyo_node hokuyo_node _frame_id:="${ROS_NAMESPACE}/laser" rosrun hokuyo_node hokuyo_node _frame_id:="${ROS_NAMESPACE}/laser"
rosrun usb_cam usb_cam_node

1
Legacy/ws_linux/src/usb_cam Submodule

@ -0,0 +1 @@
Subproject commit 3ce8ee1c47c03be37229bf5857ae9a309d8eb1e8

3
install.sh
View File

@ -7,6 +7,9 @@ fi
cp rosaria-docker.service /etc/systemd/system/ cp rosaria-docker.service /etc/systemd/system/
chmod g+w /etc/systemd/system/rosaria-docker.service chmod g+w /etc/systemd/system/rosaria-docker.service
git submodule init
git submodule update
systemctl daemon-reload systemctl daemon-reload
systemctl enable rosaria-docker.service systemctl enable rosaria-docker.service
systemctl start rosaria-docker.service systemctl start rosaria-docker.service

5
run.sh
View File

@ -2,5 +2,6 @@
# Script running rosaria inside docker container # Script running rosaria inside docker container
echo "ID: $PIONIER_ID" 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' 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 --mount type=bind,source=/home/lab1_5/rosaria/Legacy/ws_linux,target=/home/lab1_5/ws/ws_linux irth7/rosaria-legacy