Renamed a bunch of the images, reworked the dockerfiles, added (hopef…

…ully!) notebook support!

.github/workflows/publish.yml

@@ -13,16 +13,18 @@ env:
 # There is a single job in this workflow.
 # It's configured to run on the latest available version of Ubuntu.
 jobs:
-  build-and-push-image:
+  build-app-images:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - image: 'hex-runtime:spacy'
-            context: './hex-python/spacy/'
-          - image: 'hex-runtime:spacy-gpu'
-            context: './hex-python/spacy/'
+          - image: 'spacy:latest'
+            context: 'python/spacy/'
+          - image: 'spacy-gpu:latest'
+            context: 'python/spacy/'
+          - image: 'cuda-535-notebook'
+            context: 'jupyter/python-cuda-535'
 
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
@@ -53,5 +55,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/ucrel/${{ matrix.image }}
-            ghcr.io/ucrel/${{ matrix.image }}-latest
+            ghcr.io/ucrel/${{ matrix.image }}

jupyter/python-cuda-535/Dockerfile

@@ -0,0 +1,22 @@
+FROM --platform=$BUILDPLATFORM quay.io/jupyter/minimal-notebook:latest
+ENV DEBIAN_FRONTEND noninteractive
+
+USER root
+
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+    git \
+    build-essential \
+    libnvidia-compute-535 \
+    software-properties-common\
+    python3.10-venv
+
+USER jovyan
+WORKDIR /home/jovyan/work
+
+ENV VIRTUAL_ENV=/home/jovyan/.venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+RUN pip3 install --upgrade pip && \
+    pip3 install -U pip setuptools wheel && \
+    pip3 install -U 'spacy[cuda11x]'

python/dask-compose.yml

@@ -0,0 +1,9 @@
+version: "3.6"
+services:
+  dask:
+    image: hex-app:dask
+    build: dask/.
+
+  dask-worker:
+    image: hex-app:dask-worker
+    build: dask-worker/.

hex-python/spacy-gpu/Dockerfile → python/spacy-gpu/Dockerfile

@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get upgrade && apt-get install -y \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     git \
     build-essential \
     software-properties-common\

hex-python/spacy/Dockerfile → python/spacy/Dockerfile

@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get upgrade && apt-get install -y \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     git \
     build-essential \
     software-properties-common\