diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 21ec736..b63cd8f 100644 --- a/.github/workflows/publish.yml +++ b/.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 \ No newline at end of file + ghcr.io/ucrel/${{ matrix.image }} \ No newline at end of file diff --git a/jupyter/python-cuda-535/Dockerfile b/jupyter/python-cuda-535/Dockerfile new file mode 100644 index 0000000..7360784 --- /dev/null +++ b/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]' \ No newline at end of file diff --git a/python/dask-compose.yml b/python/dask-compose.yml new file mode 100644 index 0000000..05f2f5a --- /dev/null +++ b/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/. \ No newline at end of file diff --git a/hex-python/spacy-gpu/Dockerfile b/python/spacy-gpu/Dockerfile similarity index 86% rename from hex-python/spacy-gpu/Dockerfile rename to python/spacy-gpu/Dockerfile index d65c0e0..140f030 100644 --- a/hex-python/spacy-gpu/Dockerfile +++ b/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\ diff --git a/hex-python/spacy/Dockerfile b/python/spacy/Dockerfile similarity index 86% rename from hex-python/spacy/Dockerfile rename to python/spacy/Dockerfile index bd01a09..59efaa9 100644 --- a/hex-python/spacy/Dockerfile +++ b/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\