switch base to datasci to reduce duplication

ucsd-ets · Jul 20, 2023 · b377f3b · b377f3b
1 parent 974f751
commit b377f3b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 29 deletions.
diff --git 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
@@ -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