Improve pass-through of docker arguments

flx42 · flx42 · commit 2e9f20b054d4 · 2018-02-22T16:28:15.000-08:00
diff --git a/nvidia-docker b/nvidia-docker
@@ -1,19 +1,19 @@
 #! /bin/bash
-# Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
 
 NV_DOCKER=${NV_DOCKER:-"docker"}
 
-DOCKER_ARGS=""
-NV_DOCKER_ARGS=""
+DOCKER_ARGS=()
+NV_DOCKER_ARGS=()
 while [ $# -gt 0 ]; do
     arg=$1
     shift
-    DOCKER_ARGS="$DOCKER_ARGS $arg"
+    DOCKER_ARGS+=("$arg")
     case $arg in
         run|create)
-            NV_DOCKER_ARGS="--runtime=nvidia"
-            if [ ! -z $NV_GPU ]; then
-                NV_DOCKER_ARGS="$NV_DOCKER_ARGS -e NVIDIA_VISIBLE_DEVICES=${NV_GPU// /,}"
+            NV_DOCKER_ARGS+=("--runtime=nvidia")
+            if [ ! -z "${NV_GPU}" ]; then
+                NV_DOCKER_ARGS+=(-e NVIDIA_VISIBLE_DEVICES="${NV_GPU// /,}")
             fi
             break
         ;;
@@ -31,4 +31,4 @@ if [ ! -z $NV_DEBUG ]; then
     set -x
 fi
 
-$NV_DOCKER $DOCKER_ARGS $NV_DOCKER_ARGS "$@"
+exec $NV_DOCKER "${DOCKER_ARGS[@]}" "${NV_DOCKER_ARGS[@]}" "$@"
