From 648f0897b5ebc4a6bf260467a84c13f605a8b5cd Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Tue, 12 Dec 2023 17:14:20 -0600
Subject: [PATCH 1/5] Drop CUDA 11.2 and 11.5, add Python 3.11 and 3.12. (#55)

---
 Dockerfile           | 2 +-
 ci/compute-matrix.jq | 1 -
 matrix.yaml          | 8 ++------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1aa4270..afbb4c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG CUDA_VER=11.8.0
+ARG CUDA_VER=12.0.1
 ARG LINUX_VER=ubuntu22.04
 FROM nvidia/cuda:${CUDA_VER}-base-${LINUX_VER}
 
diff --git a/ci/compute-matrix.jq b/ci/compute-matrix.jq
index 404c305..b9b0232 100644
--- a/ci/compute-matrix.jq
+++ b/ci/compute-matrix.jq
@@ -1,7 +1,6 @@
 def compute_arch($x):
   ["amd64"] |
   if
-    $x.CUDA_VER > "11.2.2" and
     $x.LINUX_VER != "centos7"
   then
     . + ["arm64"]
diff --git a/matrix.yaml b/matrix.yaml
index 9fd921f..cc8ed59 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -1,13 +1,13 @@
 CUDA_VER:
-  - "11.2.2"
   - "11.4.3"
-  - "11.5.2"
   - "11.8.0"
   - "12.0.1"
   - "12.1.1"
 PYTHON_VER:
   - "3.9"
   - "3.10"
+  - "3.11"
+  - "3.12"
 LINUX_VER:
   - "ubuntu20.04"
   - "ubuntu22.04"
@@ -16,9 +16,5 @@ LINUX_VER:
 IMAGE_REPO:
   - "miniforge-cuda"
 exclude:
-  - LINUX_VER: "ubuntu22.04"
-    CUDA_VER: "11.2.2"
   - LINUX_VER: "ubuntu22.04"
     CUDA_VER: "11.4.3"
-  - LINUX_VER: "ubuntu22.04"
-    CUDA_VER: "11.5.2"

From b74ecc4fea3b487bb31cf16f1fe36ddac6e972c6 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Wed, 20 Dec 2023 09:47:16 -0600
Subject: [PATCH 2/5] add CUDA 12.2 (#56)

---
 matrix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix.yaml b/matrix.yaml
index cc8ed59..50031fc 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -2,7 +2,7 @@ CUDA_VER:
   - "11.4.3"
   - "11.8.0"
   - "12.0.1"
-  - "12.1.1"
+  - "12.2.2"
 PYTHON_VER:
   - "3.9"
   - "3.10"

From f7276218b12904b0ffe2995fc5484b01a3498fd8 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 3 Jan 2024 09:34:55 -0600
Subject: [PATCH 3/5] make build-arg passing stricter (#57)

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index afbb4c3..009d977 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-ARG CUDA_VER=12.0.1
-ARG LINUX_VER=ubuntu22.04
+ARG CUDA_VER=notset
+ARG LINUX_VER=notset
 FROM nvidia/cuda:${CUDA_VER}-base-${LINUX_VER}
 
 ARG LINUX_VER
-ARG PYTHON_VER=3.10
+ARG PYTHON_VER
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PATH=/opt/conda/bin:$PATH
 ENV PYTHON_VERSION=${PYTHON_VER}

From 760a8151bb7525b887130a3ca4c706e03ad36141 Mon Sep 17 00:00:00 2001
From: AJ Schmidt <ajschmidt8@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:27:09 -0500
Subject: [PATCH 4/5] Remove `libnuma` (#59)

---
 Dockerfile | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 009d977..9847f6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,20 +44,6 @@ RUN case "${LINUX_VER}" in \
       && apt-get install -y --no-install-recommends \
         # needed by the ORC library used by pyarrow, because it provides /etc/localtime
         tzdata \
-        # needed by dask/ucx
-        # TODO: remove these packages once they're available on conda
-        libnuma1 libnuma-dev \
       && rm -rf "/var/lib/apt/lists/*"; \
       ;; \
-    "centos"* | "rockylinux"*) \
-      yum -y update \
-      && yum -y install --setopt=install_weak_deps=False \
-        # needed by dask/ucx
-        # TODO: remove these packages once they're available on conda
-        numactl-devel numactl-libs \
-      && yum clean all; \
-      ;; \
-    *) \
-      echo "Unsupported LINUX_VER: ${LINUX_VER}" && exit 1; \
-      ;; \
   esac

From 5c44379c3b92f333c9a55ce3f3e84778d5211778 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:57:41 -0500
Subject: [PATCH 5/5] Update condaforge/miniforge3 Docker tag to v23.11.0-0
 (#58)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9847f6f..eef20a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN groupadd conda; \
   usermod -g conda root
 
 # Ownership & permissions based on https://docs.anaconda.com/anaconda/install/multi-user/#multi-user-anaconda-installation-on-linux
-COPY --from=condaforge/miniforge3:23.3.1-1 --chown=root:conda --chmod=770 /opt/conda /opt/conda
+COPY --from=condaforge/miniforge3:23.11.0-0 --chown=root:conda --chmod=770 /opt/conda /opt/conda
 
 # Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
 RUN chmod g+ws /opt/conda