update docker_run

biomotion · Mar 30, 2020 · 72efb0d · 72efb0d
1 parent 1ac4b94
commit 72efb0d
Showing 1 changed file with 2 additions and 31 deletions.
diff --git a/docker_run.sh b/docker_run.sh
@@ -4,36 +4,9 @@ function usage()
 {
     echo "To run the docker for waymo-viewer:"
     echo ""
-    echo "./run.sh [PATH_TO_DATA_SEGMENT] [OUTPUT_PATH]"
+    echo "./docker_run.sh [PATH_TO_DATA_SEGMENT] [OUTPUT_PATH]"
 }
 
-docker_runtime=runc
-# if [ "$(docker info|grep nvidia)" == "" ]; then
-#     echo "no nvidia-docker available"
-# else
-# 	echo "nvidia-docker found"
-# 	docker_runtime=nvidia
-# fi
-
-# XAUTH=/tmp/.docker.xauth
-# if [ ! -f $XAUTH ]
-# then
-#     xauth_list=$(xauth nlist $DISPLAY)
-#     xauth_list=$(sed -e 's/^..../ffff/' <<< "$xauth_list")
-#     if [ ! -z "$xauth_list" ]
-#     then
-#         echo "$xauth_list" | xauth -f $XAUTH nmerge -
-#     else
-#         touch $XAUTH
-#     fi
-#     chmod a+r $XAUTH
-# fi
-
-# # Prevent executing "docker run" when xauth failed.
-# if [ ! -f $XAUTH ]; then
-#     echo "[$XAUTH] was not properly created. Exiting..."
-#     exit 1
-# fi
 
 BASH_OPTION="roslaunch waymo_viewer recorder.launch"
 if [ -z "$1" ]; then
@@ -48,11 +21,9 @@ fi
 
 BASH_OPTION=bash
 
-
 echo "running $BASH_OPTION in docker"
 
 docker run -it --rm \
-        --runtime=$docker_runtime \
         --network host \
         --privileged \
         --name waymo-viewer \
@@ -68,4 +39,4 @@ docker run -it --rm \
         -v "${PWD}/catkin_ws:/waymo_ws" \
         -v "${PWD}/waymo-od:/waymo-od" \
 	    -w /waymo_ws \
-        biomotion/waymo-viewer:1.0 $BASH_OPTION
+        biomotion/waymo-viewer:1.0 $BASH_OPTION