From 0f87bb14748a1c3c6125761472c2e4ea6c599aa9 Mon Sep 17 00:00:00 2001
From: Christopher Harris <xixonia@gmail.com>
Date: Tue, 28 Nov 2023 13:31:57 -0600
Subject: [PATCH 1/3] fix cuda version detection mechanism

---
 features/src/cuda/install.sh                                    | 2 +-
 .../opt/rapids-build-utils/bin/make-conda-env.sh                | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-env.sh                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/src/cuda/install.sh b/features/src/cuda/install.sh
index 9cf76a78..2246ddca 100644
--- a/features/src/cuda/install.sh
+++ b/features/src/cuda/install.sh
@@ -65,7 +65,7 @@ echo "Installing dev CUDA toolkit...";
 export CUDA_HOME="/usr/local/cuda";
 
 cuda_ver="${VERSION}";
-cuda_ver=$(cut -d'.' -f3 --complement <<< "${cuda_ver}");
+cuda_ver=$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_ver}");
 
 cudapath="${CUDA_HOME}-${cuda_ver}";
 cuda_tag="cuda${cuda_ver}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 7205cbe6..a8a7378f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -14,7 +14,7 @@ make_conda_env() {
     fi
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(cut -d'.' -f3 --complement <<< "${cuda_version}")";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 6705f612..964ff095 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -14,7 +14,7 @@ make_pip_env() {
     fi
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(cut -d'.' -f3 --complement <<< "${cuda_version}")";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
     local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";

From fab76438a7f346ffca2d3e1f1f94f83745b82796 Mon Sep 17 00:00:00 2001
From: Christopher Harris <xixonia@gmail.com>
Date: Tue, 28 Nov 2023 14:00:04 -0600
Subject: [PATCH 2/3] update feature version

---
 features/src/rapids-build-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index 3e518348..190fad5c 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.2.1",
+  "version": "24.2.2",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

From ee741fb73bf26a4347d963c3ea7a8a94913aaa29 Mon Sep 17 00:00:00 2001
From: Christopher Harris <xixonia@gmail.com>
Date: Tue, 28 Nov 2023 14:00:36 -0600
Subject: [PATCH 3/3] update feature version

---
 features/src/cuda/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
index ae9e1711..ab4cf263 100644
--- a/features/src/cuda/devcontainer-feature.json
+++ b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {