From 7220d3151e17346db12b2f65c6b8b2e979e67c88 Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 10:24:06 +0200 Subject: [PATCH 1/8] create reana-dev env --- .github/workflows/env-build.yaml | 2 +- vre-singleuser-reana-dev/Dockerfile | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 vre-singleuser-reana-dev/Dockerfile diff --git a/.github/workflows/env-build.yaml b/.github/workflows/env-build.yaml index c3c84ba..6bbe051 100644 --- a/.github/workflows/env-build.yaml +++ b/.github/workflows/env-build.yaml @@ -3,7 +3,7 @@ name: Docker automatic build and publish on: push: branches: - - main + - reana_dev env: REGISTRY: ghcr.io diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile new file mode 100644 index 0000000..4c599df --- /dev/null +++ b/vre-singleuser-reana-dev/Dockerfile @@ -0,0 +1,21 @@ +FROM jupyter/scipy-notebook:python-3.9.13 +LABEL author="Image based on the work by Muhammad Aditya Hilmy - ESCAPE WP2 2020" +LABEL maintainer="VRE Team @ CERN 22/23 - E. Garcia, E. Gazzarrini, D. Gosein" +LABEL org.opencontainers.image.source https://github.com/vre-hub/environments +ARG BUILD_DATE +LABEL org.label-schema.build-date=$BUILD_DATE + +RUN pip install --upgrade pipw + +USER $NB_UID + +RUN pip install reana-client ipykernel + +USER root + +ENV JUPYTER_ENABLE_LAB=yes + +WORKDIR $HOME +USER $NB_UID + +CMD ["start-notebook.sh"] From c8fae0d089400db42ac9d158229c67a5be6d83c6 Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 10:36:32 +0200 Subject: [PATCH 2/8] create dirs for tokens --- vre-singleuser-reana-dev/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index 4c599df..207f0f7 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -11,6 +11,8 @@ USER $NB_UID RUN pip install reana-client ipykernel +RUN mkdir -p /certs + USER root ENV JUPYTER_ENABLE_LAB=yes From bbb13ac81196ef9bd3c0b95408cdc0cb44f14b6c Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 10:39:33 +0200 Subject: [PATCH 3/8] change reana dev image to latests, for testing purposes --- vre-singleuser-reana-dev/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index 207f0f7..9c590e7 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -1,6 +1,6 @@ FROM jupyter/scipy-notebook:python-3.9.13 LABEL author="Image based on the work by Muhammad Aditya Hilmy - ESCAPE WP2 2020" -LABEL maintainer="VRE Team @ CERN 22/23 - E. Garcia, E. Gazzarrini, D. Gosein" +LABEL maintainer="VRE Team @ CERN 2024 - E. Garcia" LABEL org.opencontainers.image.source https://github.com/vre-hub/environments ARG BUILD_DATE LABEL org.label-schema.build-date=$BUILD_DATE @@ -11,10 +11,9 @@ USER $NB_UID RUN pip install reana-client ipykernel -RUN mkdir -p /certs - USER root +RUN mkdir -p /certs ENV JUPYTER_ENABLE_LAB=yes WORKDIR $HOME From 18e74ebced5daac3861b3c98087a76fb5658dedd Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 10:43:03 +0200 Subject: [PATCH 4/8] create dirs for tokens --- vre-singleuser-reana-dev/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index 9c590e7..a112d27 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -14,6 +14,9 @@ RUN pip install reana-client ipykernel USER root RUN mkdir -p /certs +RUN mkdir -p /opt/rucio \ + && chown -R $NB_UID /opt/rucio + ENV JUPYTER_ENABLE_LAB=yes WORKDIR $HOME From 6fb9dfeece8d4973e43a5264edc8ba49f8bcc37e Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 11:01:38 +0200 Subject: [PATCH 5/8] reana-dev on vre-dev --- vre-singleuser-reana-dev/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index a112d27..efa8b33 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -1,4 +1,4 @@ -FROM jupyter/scipy-notebook:python-3.9.13 +FROM quay.io/jupyter/scipy-notebook:python-3.11.8 LABEL author="Image based on the work by Muhammad Aditya Hilmy - ESCAPE WP2 2020" LABEL maintainer="VRE Team @ CERN 2024 - E. Garcia" LABEL org.opencontainers.image.source https://github.com/vre-hub/environments @@ -16,6 +16,10 @@ USER root RUN mkdir -p /certs RUN mkdir -p /opt/rucio \ && chown -R $NB_UID /opt/rucio +RUN fix-permissions $HOME/.jupyter + +ENV JUPYTER_ENABLE_LAB=yes +ENV JUPYTERHUB_SINGLEUSER_APP=jupyter-server ENV JUPYTER_ENABLE_LAB=yes From ed39e6522a95959a2c8a24c8cb6eec008617b0bf Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 11:08:04 +0200 Subject: [PATCH 6/8] typo in dockerfile --- vre-singleuser-reana-dev/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index efa8b33..e550e76 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.source https://github.com/vre-hub/environments ARG BUILD_DATE LABEL org.label-schema.build-date=$BUILD_DATE -RUN pip install --upgrade pipw +RUN pip install --upgrade pip USER $NB_UID From 40fb1fef0453bc6e4d6477702e9ee95e0b148871 Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 11:14:46 +0200 Subject: [PATCH 7/8] dev cluster and python3.9 --- vre-singleuser-reana-dev/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index e550e76..1ac9ddf 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/jupyter/scipy-notebook:python-3.11.8 +FROM jupyter/scipy-notebook:python-3.9.13 LABEL author="Image based on the work by Muhammad Aditya Hilmy - ESCAPE WP2 2020" LABEL maintainer="VRE Team @ CERN 2024 - E. Garcia" LABEL org.opencontainers.image.source https://github.com/vre-hub/environments From 1727eb202b022cfa2be78c1d6240975a454ba170 Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Thu, 4 Jul 2024 11:21:19 +0200 Subject: [PATCH 8/8] build --- vre-singleuser-reana-dev/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vre-singleuser-reana-dev/Dockerfile b/vre-singleuser-reana-dev/Dockerfile index 1ac9ddf..589ea5e 100644 --- a/vre-singleuser-reana-dev/Dockerfile +++ b/vre-singleuser-reana-dev/Dockerfile @@ -19,7 +19,7 @@ RUN mkdir -p /opt/rucio \ RUN fix-permissions $HOME/.jupyter ENV JUPYTER_ENABLE_LAB=yes -ENV JUPYTERHUB_SINGLEUSER_APP=jupyter-server +# ENV JUPYTERHUB_SINGLEUSER_APP=jupyter-server ENV JUPYTER_ENABLE_LAB=yes