From d0991b37e2bc42ee7fac6060f8ccd46a73df406c Mon Sep 17 00:00:00 2001 From: Garry O'Donnell Date: Tue, 10 Jan 2023 11:15:22 +0000 Subject: [PATCH] Remove runlabels --- Dockerfile | 6 ------ README.md | 7 +++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1eb396..cb50ede 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,6 @@ RUN pip install --upgrade .[interactive] EXPOSE 8888 -LABEL uk.ac.diamond.bookshelf.runlabel="podman run --rm --publish 8888:8888 IMAGE" - CMD ["jupyter-lab", "--ip=0.0.0.0", "--allow-root"] FROM python:${PYTHON_VERSION}-slim as processing @@ -26,8 +24,6 @@ RUN pip install --upgrade .[processing] VOLUME /inputs /outputs -LABEL uk.ac.diamond.bookshelf.runlabel="podman run --rm --volume .:/outputs --volume .:/inputs --security-opt=label=type:container_runtime_t IMAGE" - ENTRYPOINT ["papermill", "notebook.ipynb", "/outputs/notebook.ipynb", "--parameters", "OUTPUT_PREFIX", "/outputs", "--parameters", "INPUT_PREFIX", "/inputs"] FROM python:${PYTHON_VERSION}-slim as service @@ -43,6 +39,4 @@ ENV NOTEBOOK_PATH="notebook.ipynb" EXPOSE 8000 -LABEL uk.ac.diamond.bookshelf.runlabel="podman run --rm --publish 8000:8000 IMAGE" - ENTRYPOINT ["papermill_service"] diff --git a/README.md b/README.md index 864d49d..b51079e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This will query the GitHub API and catalogue all containers in the DiamondLightS ### Interactive (local) ``` -podman container runlabel uk.ac.diamond.bookshelf.runlabel ghcr.io/garryod/bookshelf-template/interactive:latest +podman run --publish 8888:8888 ghcr.io/garryod/bookshelf-template/interactive:latest ``` or ``` @@ -26,7 +26,6 @@ module load bookshelf/bookshelf-i18-xrf/latest bookshelf-i18-xrf-interactive ``` - ### Interactive (hosted) 1. Go to https://jupyterhub.diamond.ac.uk/hub/home @@ -35,7 +34,7 @@ bookshelf-i18-xrf-interactive ### Processing ``` -podman container runlabel uk.ac.diamond.bookshelf.runlabel ghcr.io/garryod/bookshelf-template/processing:latest +podman run --volume .:/outputs --volume .:/inputs --security-opt=label=type:container_runtime_t ghcr.io/garryod/bookshelf-template/processing:latest ``` or ``` @@ -46,5 +45,5 @@ bookshelf-i18-xrf-processing ### Service (local) ``` -podman container runlabel uk.ac.diamond.bookshelf.runlabel ghcr.io/garryod/bookshelf-template/service:latest +podman run --publish 8000:8000 ghcr.io/garryod/bookshelf-template/service:latest ```