From 430cd7196859e17654c6f35cfad8c19134d8342a Mon Sep 17 00:00:00 2001
From: Tommy Persson <tommmy.persson@liu.se>
Date: Fri, 16 Oct 2020 17:52:10 +0200
Subject: [PATCH] Work on development environment.
---
script/wrun | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/script/wrun b/script/wrun
index f75c9e1..61902c5 100755
--- a/script/wrun
+++ b/script/wrun
@@ -1,7 +1,5 @@
#!/bin/bash
-# -e DISPLAY=unix${DISPLAY}\
-
if [[ $(lsb_release -rs) == "18.04" ]]; then
docker run \
--network host \
@@ -9,7 +7,7 @@ docker run \
--ipc=host \
-v /tmp/.X11-unix:/tmp/.X11-unix \
-v /tmp:/exttmp \
- -e DISPLAY=unix${DISPLAY}\
+ -e DISPLAY=unix${DISPLAY}\
-e ROS_HOSTNAME=localhost \
--rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@"
fi
@@ -21,7 +19,7 @@ docker run \
--ipc=host \
-v /tmp/.X11-unix:/tmp/.X11-unix \
-v /tmp:/exttmp \
- -e DISPLAY=${DISPLAY}\
+ -e DISPLAY=unix${DISPLAY}\
-e ROS_HOSTNAME=localhost \
--rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
fi
--
GitLab