From 1cef4b4ed0a520be64c87ce2aadd17b5b765525a Mon Sep 17 00:00:00 2001
From: Tommy Persson <tommmy.persson@liu.se>
Date: Fri, 16 Oct 2020 17:37:12 +0200
Subject: [PATCH] Work on development environment.
---
doc/local_ros_installation.md | 4 ++++
script/wrun | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/local_ros_installation.md b/doc/local_ros_installation.md
index 14cb2d3..f3cfab5 100644
--- a/doc/local_ros_installation.md
+++ b/doc/local_ros_installation.md
@@ -25,6 +25,10 @@ Get the waraps repo:
```bash
git clone git@gitlab.liu.se:lrs/waraps.git
```
+or if you need to specify the key:
+```bash
+GIT_SSH_COMMAND='ssh -i ~/.ssh/wara_deploy -o IdentitiesOnly=yes' git clone git@gitlab.liu.se:lrs/waraps.git
+```
Put the script directory of the waraps repo in your PATH plus add
some variables that are needed. For example in .bashrc:
diff --git a/script/wrun b/script/wrun
index 61902c5..f75c9e1 100755
--- a/script/wrun
+++ b/script/wrun
@@ -1,5 +1,7 @@
#!/bin/bash
+# -e DISPLAY=unix${DISPLAY}\
+
if [[ $(lsb_release -rs) == "18.04" ]]; then
docker run \
--network host \
@@ -7,7 +9,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
@@ -19,7 +21,7 @@ docker run \
--ipc=host \
-v /tmp/.X11-unix:/tmp/.X11-unix \
-v /tmp:/exttmp \
- -e DISPLAY=unix${DISPLAY}\
+ -e DISPLAY=${DISPLAY}\
-e ROS_HOSTNAME=localhost \
--rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
fi
--
GitLab