From c3f4e2acd73bd36e9b6ca4c8069c30a9f7322f30 Mon Sep 17 00:00:00 2001
From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com>
Date: Mon, 15 Mar 2021 18:59:51 -0400
Subject: [PATCH 1/2] ENH Add GDS header to rapidsai devel images

Used for testing and builds for GDS support
---
 rapidsai/devel-centos7.Dockerfile | 3 +++
 rapidsai/devel.Dockerfile         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/rapidsai/devel-centos7.Dockerfile b/rapidsai/devel-centos7.Dockerfile
index 3d1c6325..b85bb132 100644
--- a/rapidsai/devel-centos7.Dockerfile
+++ b/rapidsai/devel-centos7.Dockerfile
@@ -124,5 +124,8 @@ RUN chmod -R ugo+w /opt/conda \
     && conda clean -tipy \
     && chmod -R ugo+w /opt/conda
 
+# Add GDS header cufile.h to image
+COPY cufile.h /usr/local/cuda/targets/x86_64-linux/lib/cufile.h
+
 ENTRYPOINT [ "/usr/bin/tini", "--" ]
 CMD [ "/bin/bash" ]
diff --git a/rapidsai/devel.Dockerfile b/rapidsai/devel.Dockerfile
index 7c053c8d..1fed3aec 100644
--- a/rapidsai/devel.Dockerfile
+++ b/rapidsai/devel.Dockerfile
@@ -137,5 +137,8 @@ RUN chmod -R ugo+w /opt/conda \
     && conda clean -tipy \
     && chmod -R ugo+w /opt/conda
 
+# Add GDS header cufile.h to image
+COPY cufile.h /usr/local/cuda/targets/x86_64-linux/lib/cufile.h
+
 ENTRYPOINT [ "/usr/bin/tini", "--" ]
 CMD [ "/bin/bash" ]

From a42f2a1219cb889fb93e3efbc0e14c75beff2908 Mon Sep 17 00:00:00 2001
From: Mike Wendt <1915404+mike-wendt@users.noreply.github.com>
Date: Mon, 15 Mar 2021 23:46:03 -0400
Subject: [PATCH 2/2] FIX Retry conda install if it fails

---
 miniforge-cuda/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/miniforge-cuda/Dockerfile b/miniforge-cuda/Dockerfile
index 87f0d7dc..fec3e67d 100644
--- a/miniforge-cuda/Dockerfile
+++ b/miniforge-cuda/Dockerfile
@@ -93,7 +93,8 @@ RUN wget --quiet ${MINIFORGE_URL} -O /miniforge.sh \
     && ln -s /opt/conda /conda
 
 # Install tini for init
-RUN conda install -k -y tini
+RUN conda install -k -y tini \
+    || conda install -k -y tini
 
 # Clean up conda and set permissions for all users
 RUN chmod -R ugo+w /opt/conda \