From c5c2ad479ee070823c2d43728136ba04297800fd Mon Sep 17 00:00:00 2001
From: Tommy Persson <tommmy.persson@liu.se>
Date: Mon, 29 Mar 2021 18:39:18 +0200
Subject: [PATCH] Fixes for devenv.

---
 script/werun | 33 +++++++++++++++++++++++++++++++++
 script/wexec |  2 +-
 script/wgrun |  4 ++--
 script/wpull |  8 ++++----
 script/wrun  |  4 ++--
 5 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100755 script/werun

diff --git a/script/werun b/script/werun
new file mode 100755
index 0000000..ea5ff0c
--- /dev/null
+++ b/script/werun
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+## using extern GPU
+
+if [[ $(lsb_release -rs) == "18.04" ]]; then
+docker run --gpus all \
+  --network host \
+  --security-opt apparmor:unconfined \
+  --ulimit nofile=1024 \
+  --ipc=host \
+  -v /tmp/.X11-unix:/tmp/.X11-unix \
+  -v /tmp:/exttmp \
+  -e DISPLAY=unix${DISPLAY}\
+  -e ROS_HOSTNAME=localhost \
+  -e __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G1 \
+  -e __GLX_VENDOR_LIBRARY_NAME=nvidia \
+  --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
+fi
+
+if [[ $(lsb_release -rs) == "20.04" ]]; then
+docker run --gpus all \
+  --network host \
+  --security-opt apparmor:unconfined \
+  --ulimit nofile=1024 \
+  --ipc=host \
+  -v /tmp/.X11-unix:/tmp/.X11-unix \
+  -v /tmp:/exttmp \
+  -e DISPLAY=unix${DISPLAY}\
+  -e ROS_HOSTNAME=localhost \
+  -e __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G1 \
+  -e __GLX_VENDOR_LIBRARY_NAME=nvidia \
+  --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
+fi
diff --git a/script/wexec b/script/wexec
index b3d5050..358f497 100755
--- a/script/wexec
+++ b/script/wexec
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker exec -it waradevel /entry.sh "$@"
+docker exec -it devenv /entry.sh "$@"
 
diff --git a/script/wgrun b/script/wgrun
index dedc956..537dfc5 100755
--- a/script/wgrun
+++ b/script/wgrun
@@ -10,7 +10,7 @@ docker run --gpus all \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@"
+  --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
 fi
 
 if [[ $(lsb_release -rs) == "20.04" ]]; then
@@ -23,5 +23,5 @@ docker run --gpus all \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
+  --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
 fi
diff --git a/script/wpull b/script/wpull
index 85f7149..295abb1 100755
--- a/script/wpull
+++ b/script/wpull
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 if [[ $(lsb_release -rs) == "18.04" ]]; then
-    echo "Pulling gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel"
-    docker pull gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel
+    echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel"
+    docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel
 fi
 
 if [[ $(lsb_release -rs) == "20.04" ]]; then
-    echo "Pulling gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel"
-    docker pull gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel
+    echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel"
+    docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel
 fi
 
 
diff --git a/script/wrun b/script/wrun
index 61902c5..59927f4 100755
--- a/script/wrun
+++ b/script/wrun
@@ -9,7 +9,7 @@ docker run \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@"
+  --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
 fi
 
 if [[ $(lsb_release -rs) == "20.04" ]]; then
@@ -21,5 +21,5 @@ docker run \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
+  --rm -it --name devenv gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
 fi
-- 
GitLab