From 6912346e711fe39bc74e7405f328797fe9267efa Mon Sep 17 00:00:00 2001 From: Tommy Persson <tommmy.persson@liu.se> Date: Tue, 22 Sep 2020 13:46:08 +0200 Subject: [PATCH] Work on doc. --- doc/local_ros_installation.md | 18 +++++++++--------- script/wgrun | 2 +- script/wrun | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/local_ros_installation.md b/doc/local_ros_installation.md index 81f3b11..c71af90 100644 --- a/doc/local_ros_installation.md +++ b/doc/local_ros_installation.md @@ -10,16 +10,16 @@ modules. ## Preparation -This is (or will be) publicly available: +Get the waraps repo: ```bash -git clone https://gitlab.liu.se/lrs/waraps.git +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: ```bash -export PATH="/home/tompe/docker/waraps/script:$PATH" +export PATH="...../waraps/script:$PATH" export WORLD_ORIGIN_LAT=57.7605573519 export WORLD_ORIGIN_LON=16.6827607783 @@ -29,7 +29,7 @@ export WORLD_ORIGIN_ELEVATION=29.8 Later you will use screen. Notice that the command key for screen is here C-o. The screen file are in: waraps/screen -NOTICE: C-o \ do not kill the docker containers. if somebody find out +NOTICE: C-o \ do not kill the docker containers. If somebody find out how to solve this problem pleae let us know. If you have gotten a lot of running containers that interfere with @@ -59,7 +59,7 @@ docker exec -it waradevel "$@" ### wgrun -Start a docker container named waradevel and run the command there. Used if you have NVIDIA graphics. +Start a docker container named waradevel and run the commands there. Use this if you have NVIDIA graphics. ```bash #!/bin/bash @@ -69,13 +69,13 @@ docker run --gpus all \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ - --rm -it --name wara gitlab.liu.se:5000/lrs/waraps_docker_images/wara-melodic:v01 "$@" + --rm -it --name wara gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:latest "$@" ``` ### wrun -Start a docker container named waradevel and run the command there. +Start a docker container named waradevel and run the command there. Use if you do not have NVIDIA graphics. ```bash #!/bin/bash @@ -85,7 +85,7 @@ docker run \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ - --rm -it --name waradevel gitlab.liu.se:5000/lrs/lrs_docker_images/wara-melodic:v01 "$@" + --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:latest "$@" ``` @@ -95,7 +95,7 @@ Pull the image. ```bash #!/bin/bash -docker pull gitlab.liu.se:5000/lrs/lrs_docker_images/wara-melodic:v01 +docker pull gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:latest ``` ## How to start different parts diff --git a/script/wgrun b/script/wgrun index afc04d3..189af24 100755 --- a/script/wgrun +++ b/script/wgrun @@ -8,5 +8,5 @@ docker run --gpus all \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ - --rm -it --name waradevel gitlab.liu.se:5000/lrs/lrs_docker_images/wara-melodic:v01 "$@" + --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:latest "$@" diff --git a/script/wrun b/script/wrun index 558e77a..555e922 100755 --- a/script/wrun +++ b/script/wrun @@ -7,4 +7,4 @@ docker run \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -e DISPLAY=unix${DISPLAY}\ -e ROS_HOSTNAME=localhost \ - --rm -it --name waradevel gitlab.liu.se:5000/lrs/lrs_docker_images/wara-melodic:v01 "$@" + --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:latest "$@" -- GitLab