diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f9b45c7..4016d3a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -41,5 +41,5 @@ // make the workspace folder the same inside and outside of the container "workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind", "workspaceFolder": "${localWorkspaceFolder}", - "postCreateCommand": "pip install -e .[interactive,processing,service]" + "postCreateCommand": "pip install -e .[interactive,processing]" } \ No newline at end of file diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index bdccc5b..028a2d1 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: true matrix: - target: ["interactive", "processing", "service"] + target: ["interactive", "processing"] runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index cb50ede..f970fdc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,18 +25,3 @@ RUN pip install --upgrade .[processing] VOLUME /inputs /outputs ENTRYPOINT ["papermill", "notebook.ipynb", "/outputs/notebook.ipynb", "--parameters", "OUTPUT_PREFIX", "/outputs", "--parameters", "INPUT_PREFIX", "/inputs"] - -FROM python:${PYTHON_VERSION}-slim as service - -ENV WORKDIR=/environment -WORKDIR ${WORKDIR} - -COPY . ${WORKDIR} - -RUN pip install --upgrade .[service] - -ENV NOTEBOOK_PATH="notebook.ipynb" - -EXPOSE 8000 - -ENTRYPOINT ["papermill_service"] diff --git a/README.md b/README.md index a83c60b..28a355c 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # Bookshelf Notebooks -This template can be used to develop container images with data processing notebooks which will be automatically deployed in three varieties: +This template can be used to develop container images with data processing notebooks which will be automatically deployed in two varieties: 1. An interactive - jupyterlab - environment, for running both locally and on the hosted JupyterLab instance 2. A headless processing image, for running both locally and as a cluster job -3. A service, which can be hosted on the k8s cluster, and accessed via a REST API ## Setting up your bookshelf @@ -47,9 +46,3 @@ or module load bookshelf/bookshelf-template/latest bookshelf-template-processing ``` - -### Service (local) - -``` -podman run --publish 8000:8000 ghcr.io/diamondlightsource/bookshelf-template/service:latest -``` diff --git a/pyproject.toml b/pyproject.toml index 2f91432..7193713 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,4 +10,3 @@ dynamic = ["version"] [project.optional-dependencies] interactive = ["jupyterlab"] processing = ["ipykernel", "black", "papermill"] -service = ["ipykernel", "black", "papermill_service"]