From 85db792918b9bd923b9b89cd1cbf024d95742a60 Mon Sep 17 00:00:00 2001
From: Fred Park <fred.park@microsoft.com>
Date: Fri, 20 Jul 2018 08:53:01 -0700
Subject: [PATCH] Fix nvidia-docker2 installation

- Properly pin dependencies
- Resolves #231
- Update bug report template
---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 ++
 scripts/shipyard_nodeprep.sh         | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5d28493..73bd84c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,6 +6,8 @@ about: Create a report to help us improve
 
 #### Problem Description
 
+#### Batch Shipyard Version
+
 #### Steps to Reproduce
 
 #### Expected Results
diff --git a/scripts/shipyard_nodeprep.sh b/scripts/shipyard_nodeprep.sh
index fab4f7c..71b62e1 100755
--- a/scripts/shipyard_nodeprep.sh
+++ b/scripts/shipyard_nodeprep.sh
@@ -9,6 +9,7 @@ set -o pipefail
 DOCKER_CE_VERSION_DEBIAN=18.03.1
 DOCKER_CE_VERSION_CENTOS=18.03.1
 DOCKER_CE_VERSION_SLES=17.09.1
+NVIDIA_CONTAINER_RUNTIME_VERSION=2.0.0
 NVIDIA_DOCKER_VERSION=2.0.3
 GLUSTER_VERSION_DEBIAN=4.1
 GLUSTER_VERSION_CENTOS=41
@@ -18,6 +19,8 @@ DOCKER_CE_PACKAGE_DEBIAN_OLD="docker-ce=${DOCKER_CE_VERSION_DEBIAN}~ce-0~"
 DOCKER_CE_PACKAGE_DEBIAN_NEW="docker-ce=${DOCKER_CE_VERSION_DEBIAN}~ce~3-0~"
 DOCKER_CE_PACKAGE_CENTOS="docker-ce-${DOCKER_CE_VERSION_CENTOS}.ce-1.el7.centos"
 DOCKER_CE_PACKAGE_SLES="docker-${DOCKER_CE_VERSION_SLES}_ce-257.3"
+NVIDIA_CONTAINER_RUNTIME_PACKAGE_UBUNTU="nvidia-container-runtime=${NVIDIA_CONTAINER_RUNTIME_VERSION}+docker${DOCKER_CE_VERSION_DEBIAN}-1"
+NVIDIA_CONTAINER_RUNTIME_PACKAGE_CENTOS="nvidia-container-runtime-${NVIDIA_CONTAINER_RUNTIME_VERSION}-1.docker${DOCKER_CE_VERSION_CENTOS}.ce"
 NVIDIA_DOCKER_PACKAGE_UBUNTU="nvidia-docker2=${NVIDIA_DOCKER_VERSION}+docker${DOCKER_CE_VERSION_DEBIAN}-1"
 NVIDIA_DOCKER_PACKAGE_CENTOS="nvidia-docker2-${NVIDIA_DOCKER_VERSION}-1.docker${DOCKER_CE_VERSION_CENTOS}.ce"
 MOUNTS_PATH=$AZ_BATCH_NODE_ROOT_DIR/mounts
@@ -604,9 +607,9 @@ EOF
     fi
     refresh_package_index
     if [ "$DISTRIB_ID" == "ubuntu" ]; then
-        install_packages "$NVIDIA_DOCKER_PACKAGE_UBUNTU"
+        install_packages "$NVIDIA_CONTAINER_RUNTIME_PACKAGE_UBUNTU" "$NVIDIA_DOCKER_PACKAGE_UBUNTU"
     elif [[ $DISTRIB_ID == centos* ]]; then
-        install_packages "$NVIDIA_DOCKER_PACKAGE_CENTOS"
+        install_packages "$NVIDIA_CONTAINER_RUNTIME_PACKAGE_CENTOS" "$NVIDIA_DOCKER_PACKAGE_CENTOS"
     fi
     # merge daemon configs if necessary
     set +e