From b377f3b06a210d1c22e023a920a4d1628bce3da3 Mon Sep 17 00:00:00 2001
From: Adam Tilghman <agt@ucsd.edu>
Date: Thu, 20 Jul 2023 12:42:55 -0700
Subject: [PATCH] switch base to datasci to reduce duplication

---
 .github/workflows/docker.yml            |  9 ++++++---
 Dockerfile                              |  7 ++-----
 scripts/build-intermediate-nvcr-cuda.sh | 21 ---------------------
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100755 scripts/build-intermediate-nvcr-cuda.sh

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 80df007..d8f1991 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -39,9 +39,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build intermediate nvcr-cuda image
-        run: scripts/build-intermediate-nvcr-cuda.sh
-
       - name: Check Free Space 2
         run: |
           echo "Free space:"
@@ -60,3 +57,9 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Check Free Space 3
+        run: |
+          echo "Free space:"
+          df -h
+
diff --git a/Dockerfile b/Dockerfile
index 13c8f21..aa55ce7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
-FROM ucsdets/scipy-ml-notebook:2023.2-stable
+FROM ucsdets/datascience-notebook:2023.2-stable
 
-# to conserve disk space during build, 
-# scripts/build-intermediate-nvcr-cuda.sh (run by github actions prior to this build) 
-# separately constructs the following intermediate container 
-COPY --from=intermediate-nvcr-cuda:latest /usr/local/cuda-11.8 /usr/local/cuda-11.8
+COPY --from=nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu20.04 /usr/local/cuda-11.8 /usr/local/cuda-11.8
 
 USER root
 RUN ln -s cuda-11.8 /usr/local/cuda && ln -s cuda-11.8 /usr/local/cuda-11
diff --git a/scripts/build-intermediate-nvcr-cuda.sh b/scripts/build-intermediate-nvcr-cuda.sh
deleted file mode 100755
index 32ba62a..0000000
--- a/scripts/build-intermediate-nvcr-cuda.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-BDIR=`mktemp -d`
-NVCR_REPO=nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu20.04
-
-cd $BDIR
-
-cat > Dockerfile <<EOM
-# absolutely blank dockerfile
-FROM scratch
-USER root
-
-# obtain from: https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda/tags
-COPY --from=${NVCR_REPO} /usr/local/cuda-11.8 /usr/local/cuda-11.8
-
-EOM
-
-docker build -t intermediate-nvcr-cuda:latest .
-
-docker rmi ${NVCR_REPO}
-