ADD NO_GPU option for docker in run.sh

README.md

@@ -51,8 +51,16 @@ pybind11-stubgen -o . --ignore-invalid=all pyridescence
 
 ### Docker
 
-* Build: `docker build -t iridescence -f docker/ubuntu/Dockerfile .`
-* Run: `bash docker/run.sh iridescence`
+* Build:  
+`docker build -t iridescence -f docker/ubuntu/Dockerfile .`
+* Run with gpu:  
+`bash docker/run.sh`
+* Run without gpu:  
+`NO_GPU=1 bash docker/run.sh`
+* Run if you don't approve the permission for docker:  
+`sudo bash docker/run.sh`
+* Example of running `01_light_viewer_basic` with a specific option:  
+`NO_GPU=1 DOCKER_IMAGE="iridescence" DOCKER_CONTAINER="iridescence" bash docker/run.sh /root/iridescence/build/01_light_viewer_basic`
 
 ## Use Iridescence in your cmake project
 

docker/run.sh

@@ -1,11 +1,53 @@
 #!/bin/bash
-xhost + local:root
+iname=${DOCKER_IMAGE:-"iridescence"} ## name of image
+cname=${DOCKER_CONTAINER:-"iridescence"} ## name of container
 
-sudo docker run -it --rm \
-			--gpus all \
-			-e DISPLAY=$DISPLAY \
-			-v /tmp/.X11-unix:/tmp/.X11-unix \
-                        -v /dev:/dev \
-			$@
+SUDO_STRING=`groups|grep docker`
+SUDO=""
+if [ -z "$SUDO_STRING" ]; then
+  SUDO="sudo "
+fi
 
-# xhost - local:root
+VAR="${@:-"bash"}"
+if [ $# -eq 0 -a -z "$OPT" ]; then
+    OPT=-it
+fi
+
+if [ -z "$NO_GPU" ]; then
+    GPU_OPT='--gpus all,"capabilities=compute,graphics,utility,display"'
+else
+    GPU_OPT=""
+fi
+
+NET_OPT="--net=host"
+
+if [ -n "$USE_USER" ]; then
+    USER_SETTING=" -u $(id -u):$(id -g) -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro"
+fi
+
+xhost +si:localuser:root
+rmimage=$(docker rm ${cname})
+
+$SUDO docker run \
+    --privileged     \
+    ${OPT}           \
+    ${GPU_OPT}       \
+    ${NET_OPT}       \
+    ${USER_SETTING}  \
+    --env="DISPLAY"  \
+    --env="QT_X11_NO_MITSHM=1" \
+    --volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \
+	--volume="/dev:/dev" \
+	--name=${cname} \
+    ${iname} \
+    ${VAR}
+
+
+## capabilities
+# compute	CUDA / OpenCL アプリケーション
+# compat32	32 ビットアプリケーション
+# graphics	OpenGL / Vulkan アプリケーション
+# utility	nvidia-smi コマンドおよび NVML
+# video		Video Codec SDK
+# display	X11 ディスプレイに出力
+# all