Skip to content
Snippets Groups Projects
Commit 430cd719 authored by Tommy Persson's avatar Tommy Persson
Browse files

Work on development environment.

parent 1cef4b4e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
script/wrun
+ 2
− 4
View file @ 430cd719
#!/bin/bash #!/bin/bash
# -e DISPLAY=unix${DISPLAY}\
if [[ $(lsb_release -rs) == "18.04" ]]; then if [[ $(lsb_release -rs) == "18.04" ]]; then
docker run \ docker run \
--network host \ --network host \
...@@ -9,7 +7,7 @@ docker run \ ...@@ -9,7 +7,7 @@ docker run \
--ipc=host \ --ipc=host \
-v /tmp/.X11-unix:/tmp/.X11-unix \ -v /tmp/.X11-unix:/tmp/.X11-unix \
-v /tmp:/exttmp \ -v /tmp:/exttmp \
-e DISPLAY=unix${DISPLAY}\ -e DISPLAY=unix${DISPLAY}\
-e ROS_HOSTNAME=localhost \ -e ROS_HOSTNAME=localhost \
--rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@" --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@"
fi fi
...@@ -21,7 +19,7 @@ docker run \ ...@@ -21,7 +19,7 @@ docker run \
--ipc=host \ --ipc=host \
-v /tmp/.X11-unix:/tmp/.X11-unix \ -v /tmp/.X11-unix:/tmp/.X11-unix \
-v /tmp:/exttmp \ -v /tmp:/exttmp \
-e DISPLAY=${DISPLAY}\ -e DISPLAY=unix${DISPLAY}\
-e ROS_HOSTNAME=localhost \ -e ROS_HOSTNAME=localhost \
--rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@" --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
fi fi
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment