Replace legacy images with Nebari-compatible images

.github/workflows/docker-build.yaml

@@ -5,58 +5,63 @@ on:
     branches:
       - main
     paths:
-      - 'images/Dockerfile*'
+      - 'images/**'
       - '.github/workflows/docker-build.yaml'
   pull_request:
     paths:
-      - 'images/Dockerfile*'
+      - 'images/**'
       - '.github/workflows/docker-build.yaml'
   workflow_dispatch:
 
 jobs:
-  docker-build:
+  build-dandi:
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
         include:
-          - tag: latest
-            dockerfile: Dockerfile
-          - tag: latest-openscope
-            dockerfile: Dockerfile.openscope
-          - tag: latest-allensdk
-            dockerfile: Dockerfile.allensdk
-          - tag: latest-gpu
-            dockerfile: Dockerfile.gpu
-          - tag: latest-gpu-allensdk
-            dockerfile: Dockerfile.gpu.allensdk
-          - tag: latest-matlab
-            dockerfile: Dockerfile.matlab
-
+          - tag: latest-nebari
+            build-args: ""
+          - tag: latest-nebari-gpu
+            build-args: "BASE_IMAGE=quay.io/nebari/nebari-jupyterlab-gpu:2024.11.1"
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Log in to Docker Hub
+      - uses: docker/login-action@v3
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_DANDIHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_DANDIHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+
+      - uses: docker/build-push-action@v6
+        with:
+          context: ./images/dandi
+          file: ./images/dandi/Dockerfile
+          build-args: ${{ matrix.build-args }}
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+          tags: dandiarchive/dandihub:${{ matrix.tag }}
+          cache-from: type=registry,ref=dandiarchive/dandihub:${{ matrix.tag }}
+          cache-to: type=inline
+
+  build-matlab:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/login-action@v3
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        with:
+          username: ${{ secrets.DOCKERHUB_DANDIHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_DANDIHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - uses: docker/setup-buildx-action@v3
 
-      - name: Build and conditionally push Docker Image
-        uses: docker/build-push-action@v6
+      - uses: docker/build-push-action@v6
         with:
-          context: ./images
-          file: ./images/${{ matrix.dockerfile }}
+          context: ./images/matlab
+          file: ./images/matlab/Dockerfile
           push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-          tags: |
-            ${{ secrets.DOCKERHUB_DANDIHUB_USERNAME }}/dandihub:${{ matrix.tag }}
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_DANDIHUB_USERNAME }}/dandihub:${{ matrix.tag }}
+          tags: dandiarchive/dandihub:latest-matlab
+          cache-from: type=registry,ref=dandiarchive/dandihub:latest-matlab
           cache-to: type=inline