Dan4ick/Lidar_Muxa
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

demo.sh работает и без терминала

Browse source
This commit is contained in:
Данил Омелечко 2026-09-27 01:50:28 +03:00
parent e241bec58d
commit 0a40fb3f6c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docker/demo.sh
View file

@ -36,10 +36,13 @@ else
WHERE="без видеокарты: считает и рисует процессор" WHERE="без видеокарты: считает и рисует процессор"
fi fi
TTY=(-it)
[ -t 0 ] || TTY=() # без терминала (из другого скрипта) — без -it
xhost +local: >/dev/null 2>&1 || true xhost +local: >/dev/null 2>&1 || true
docker rm -f flyguard_demo >/dev/null 2>&1 || true docker rm -f flyguard_demo >/dev/null 2>&1 || true
echo "показ: $BAG с $START с, $WHERE" echo "показ: $BAG с $START с, $WHERE"
exec docker run --rm -it --name flyguard_demo --network host --ipc host "${GPU[@]}" \ exec docker run --rm "${TTY[@]}" --name flyguard_demo --network host --ipc host "${GPU[@]}" \
-e DISPLAY="${DISPLAY:-:0}" -v /tmp/.X11-unix:/tmp/.X11-unix -v "$BAGS":/data:ro \ -e DISPLAY="${DISPLAY:-:0}" -v /tmp/.X11-unix:/tmp/.X11-unix -v "$BAGS":/data:ro \
"$IMAGE" ros2 launch flyguard detect.launch.py bag:=/data/"$BAG" start:="$START" \ "$IMAGE" ros2 launch flyguard detect.launch.py bag:=/data/"$BAG" start:="$START" \
rviz:=true brain_view:=true brain_scale:="${BRAIN_SCALE:-2}" rviz:=true brain_view:=true brain_scale:="${BRAIN_SCALE:-2}"