From e9b98f2e793fafcb4c636c57df6c27035e7e5a37 Mon Sep 17 00:00:00 2001
From: David Gardner <dagardner@nvidia.com>
Date: Fri, 11 Oct 2024 14:43:51 -0700
Subject: [PATCH 1/2] Update cuda version for docker containers

---
 .../devcontainer.json                              | 14 +++++++-------
 docker/Dockerfile                                  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename .devcontainer/{cuda12.1-conda => cuda12.5-conda}/devcontainer.json (94%)

diff --git a/.devcontainer/cuda12.1-conda/devcontainer.json b/.devcontainer/cuda12.5-conda/devcontainer.json
similarity index 94%
rename from .devcontainer/cuda12.1-conda/devcontainer.json
rename to .devcontainer/cuda12.5-conda/devcontainer.json
index ee34c67fa8..2a320a35cc 100644
--- a/.devcontainer/cuda12.1-conda/devcontainer.json
+++ b/.devcontainer/cuda12.5-conda/devcontainer.json
@@ -3,7 +3,7 @@
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
     "args": {
-      "CUDA": "12.1",
+      "CUDA": "12.5",
       "PYTHON_PACKAGE_MANAGER": "conda",
       "BASE": "rapidsai/devcontainers:24.10-cpp-mambaforge-ubuntu22.04"
     }
@@ -47,7 +47,7 @@
   "initializeCommand": [
     "/bin/bash",
     "-c",
-    "${localWorkspaceFolder}/.devcontainer/initialize-command.sh && mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.1-envs}"
+    "${localWorkspaceFolder}/.devcontainer/initialize-command.sh && mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.5-envs}"
   ],
   "postAttachCommand": [
     "/bin/bash",
@@ -66,7 +66,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
-    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.1-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
+    "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.5-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
   ],
   "customizations": {
     "vscode": {
@@ -102,11 +102,11 @@
         "C_Cpp.intelliSenseEngine": "disabled",
         "python.terminal.activateEnvironment": false,
         "files.watcherExclude": {
-            "**/.git/objects/**": true,
-            "**/.git/subtree-cache/**": true,
-            "**/.cache/**": true
+          "**/.git/objects/**": true,
+          "**/.git/subtree-cache/**": true,
+          "**/.cache/**": true
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index be44ca1869..fa146b16a5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,7 +47,7 @@
 # Args used in FROM commands must come first
 ARG FROM_IMAGE="nvidia/cuda"
 ARG CUDA_MAJOR_VER=12
-ARG CUDA_MINOR_VER=1
+ARG CUDA_MINOR_VER=5
 ARG CUDA_REV_VER=1
 ARG LINUX_DISTRO=ubuntu
 ARG LINUX_VER=22.04

From 2039b2d37db3a5a87964f68fddf18303e3280612 Mon Sep 17 00:00:00 2001
From: David Gardner <dagardner@nvidia.com>
Date: Mon, 14 Oct 2024 08:58:15 -0700
Subject: [PATCH 2/2] Update build script

---
 docker/build_container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/build_container.sh b/docker/build_container.sh
index 85877583f7..1b86b6ada9 100755
--- a/docker/build_container.sh
+++ b/docker/build_container.sh
@@ -29,7 +29,7 @@ DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}
 
 # Build args
 CUDA_MAJOR_VER=${CUDA_MAJOR_VER:-12}
-CUDA_MINOR_VER=${CUDA_MINOR_VER:-1}
+CUDA_MINOR_VER=${CUDA_MINOR_VER:-5}
 CUDA_REV_VER=${CUDA_REV_VER:-1}
 FROM_IMAGE=${FROM_IMAGE:-"nvidia/cuda"}
 LINUX_DISTRO=${LINUX_DISTRO:-ubuntu}