From 19049a816b64b829eae01b97ea95cc12f6e6669a Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 27 Dec 2023 12:56:43 -0800 Subject: [PATCH] Manually set PATH and VIRTUAL_ENV for all binder related files Ref https://github.com/rocker-org/rocker-versioned2/issues/739 --- dockerfiles/binder_4.0.0.Dockerfile | 2 ++ dockerfiles/binder_4.0.1.Dockerfile | 2 ++ dockerfiles/binder_4.0.2.Dockerfile | 2 ++ dockerfiles/binder_4.0.3.Dockerfile | 2 ++ dockerfiles/binder_4.0.4.Dockerfile | 2 ++ dockerfiles/binder_4.0.5.Dockerfile | 2 ++ dockerfiles/binder_4.1.0.Dockerfile | 2 ++ dockerfiles/binder_4.1.1.Dockerfile | 2 ++ dockerfiles/binder_4.1.2.Dockerfile | 2 ++ dockerfiles/binder_4.1.3.Dockerfile | 2 ++ dockerfiles/binder_4.2.0.Dockerfile | 2 ++ dockerfiles/binder_4.2.1.Dockerfile | 2 ++ dockerfiles/binder_4.2.2.Dockerfile | 2 ++ dockerfiles/binder_4.2.3.Dockerfile | 2 ++ dockerfiles/binder_4.3.0.Dockerfile | 2 ++ stacks/4.0.0.json | 4 +++- stacks/4.0.1.json | 4 +++- stacks/4.0.2.json | 4 +++- stacks/4.0.3.json | 4 +++- stacks/4.0.4.json | 4 +++- stacks/4.0.5.json | 4 +++- stacks/4.1.0.json | 4 +++- stacks/4.1.1.json | 4 +++- stacks/4.1.2.json | 4 +++- stacks/4.1.3.json | 4 +++- stacks/4.2.0.json | 4 +++- stacks/4.2.1.json | 4 +++- stacks/4.2.2.json | 4 +++- stacks/4.2.3.json | 4 +++- stacks/4.3.0.json | 4 +++- 30 files changed, 75 insertions(+), 15 deletions(-) diff --git a/dockerfiles/binder_4.0.0.Dockerfile b/dockerfiles/binder_4.0.0.Dockerfile index 24c9f5ee..0bf2f54b 100644 --- a/dockerfiles/binder_4.0.0.Dockerfile +++ b/dockerfiles/binder_4.0.0.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.0.1.Dockerfile b/dockerfiles/binder_4.0.1.Dockerfile index 7a868758..5cd1ee97 100644 --- a/dockerfiles/binder_4.0.1.Dockerfile +++ b/dockerfiles/binder_4.0.1.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.0.2.Dockerfile b/dockerfiles/binder_4.0.2.Dockerfile index b1679003..b02a5120 100644 --- a/dockerfiles/binder_4.0.2.Dockerfile +++ b/dockerfiles/binder_4.0.2.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.0.3.Dockerfile b/dockerfiles/binder_4.0.3.Dockerfile index d04a7d7e..0d553acf 100644 --- a/dockerfiles/binder_4.0.3.Dockerfile +++ b/dockerfiles/binder_4.0.3.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.0.4.Dockerfile b/dockerfiles/binder_4.0.4.Dockerfile index f2f008d4..e0e28112 100644 --- a/dockerfiles/binder_4.0.4.Dockerfile +++ b/dockerfiles/binder_4.0.4.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.0.5.Dockerfile b/dockerfiles/binder_4.0.5.Dockerfile index b27683fe..504ca5dd 100644 --- a/dockerfiles/binder_4.0.5.Dockerfile +++ b/dockerfiles/binder_4.0.5.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.1.0.Dockerfile b/dockerfiles/binder_4.1.0.Dockerfile index a72ea20c..fd26f1f6 100644 --- a/dockerfiles/binder_4.1.0.Dockerfile +++ b/dockerfiles/binder_4.1.0.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.1.1.Dockerfile b/dockerfiles/binder_4.1.1.Dockerfile index 4e591c89..bdcbc858 100644 --- a/dockerfiles/binder_4.1.1.Dockerfile +++ b/dockerfiles/binder_4.1.1.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.1.2.Dockerfile b/dockerfiles/binder_4.1.2.Dockerfile index b2c56087..6cf0e23d 100644 --- a/dockerfiles/binder_4.1.2.Dockerfile +++ b/dockerfiles/binder_4.1.2.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.1.3.Dockerfile b/dockerfiles/binder_4.1.3.Dockerfile index f28e984f..88c47567 100644 --- a/dockerfiles/binder_4.1.3.Dockerfile +++ b/dockerfiles/binder_4.1.3.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.2.0.Dockerfile b/dockerfiles/binder_4.2.0.Dockerfile index 0b053cd1..e9f4de19 100644 --- a/dockerfiles/binder_4.2.0.Dockerfile +++ b/dockerfiles/binder_4.2.0.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.2.1.Dockerfile b/dockerfiles/binder_4.2.1.Dockerfile index 7d2c8cdb..1cb41985 100644 --- a/dockerfiles/binder_4.2.1.Dockerfile +++ b/dockerfiles/binder_4.2.1.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.2.2.Dockerfile b/dockerfiles/binder_4.2.2.Dockerfile index 4917bb73..7ebbcbf0 100644 --- a/dockerfiles/binder_4.2.2.Dockerfile +++ b/dockerfiles/binder_4.2.2.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.2.3.Dockerfile b/dockerfiles/binder_4.2.3.Dockerfile index e9a977d9..7076faa2 100644 --- a/dockerfiles/binder_4.2.3.Dockerfile +++ b/dockerfiles/binder_4.2.3.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/dockerfiles/binder_4.3.0.Dockerfile b/dockerfiles/binder_4.3.0.Dockerfile index 8d3fc718..54f3e27d 100644 --- a/dockerfiles/binder_4.3.0.Dockerfile +++ b/dockerfiles/binder_4.3.0.Dockerfile @@ -6,6 +6,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.authors="Carl Boettiger " ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} RUN /rocker_scripts/install_jupyter.sh diff --git a/stacks/4.0.0.json b/stacks/4.0.0.json index c7897818..46550c80 100644 --- a/stacks/4.0.0.json +++ b/stacks/4.0.0.json @@ -145,7 +145,9 @@ }, "FROM": "rocker/geospatial:4.0.0", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.0.1.json b/stacks/4.0.1.json index 60d6aeda..d9ec52b0 100644 --- a/stacks/4.0.1.json +++ b/stacks/4.0.1.json @@ -136,7 +136,9 @@ }, "FROM": "rocker/geospatial:4.0.1", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.0.2.json b/stacks/4.0.2.json index 5377185b..dfe9ef94 100644 --- a/stacks/4.0.2.json +++ b/stacks/4.0.2.json @@ -136,7 +136,9 @@ }, "FROM": "rocker/geospatial:4.0.2", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.0.3.json b/stacks/4.0.3.json index 768be32c..e737abe4 100644 --- a/stacks/4.0.3.json +++ b/stacks/4.0.3.json @@ -136,7 +136,9 @@ }, "FROM": "rocker/geospatial:4.0.3", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.0.4.json b/stacks/4.0.4.json index d1a898a6..1a055b56 100644 --- a/stacks/4.0.4.json +++ b/stacks/4.0.4.json @@ -136,7 +136,9 @@ }, "FROM": "rocker/geospatial:4.0.4", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.0.5.json b/stacks/4.0.5.json index e8d046b5..86eb2136 100644 --- a/stacks/4.0.5.json +++ b/stacks/4.0.5.json @@ -143,7 +143,9 @@ }, "FROM": "rocker/geospatial:4.0.5", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.1.0.json b/stacks/4.1.0.json index c5bc7d7e..a6624dd2 100644 --- a/stacks/4.1.0.json +++ b/stacks/4.1.0.json @@ -158,7 +158,9 @@ }, "FROM": "rocker/geospatial:4.1.0", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.1.1.json b/stacks/4.1.1.json index 31270db8..c6f203e9 100644 --- a/stacks/4.1.1.json +++ b/stacks/4.1.1.json @@ -158,7 +158,9 @@ }, "FROM": "rocker/geospatial:4.1.1", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.1.2.json b/stacks/4.1.2.json index 5fe0a9df..685668ae 100644 --- a/stacks/4.1.2.json +++ b/stacks/4.1.2.json @@ -158,7 +158,9 @@ }, "FROM": "rocker/geospatial:4.1.2", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.1.3.json b/stacks/4.1.3.json index ac77d87f..f47773c8 100644 --- a/stacks/4.1.3.json +++ b/stacks/4.1.3.json @@ -179,7 +179,9 @@ }, "FROM": "rocker/geospatial:4.1.3", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.2.0.json b/stacks/4.2.0.json index 40033f9a..387b6014 100644 --- a/stacks/4.2.0.json +++ b/stacks/4.2.0.json @@ -165,7 +165,9 @@ }, "FROM": "rocker/geospatial:4.2.0", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.2.1.json b/stacks/4.2.1.json index 63f35f24..132f93fc 100644 --- a/stacks/4.2.1.json +++ b/stacks/4.2.1.json @@ -165,7 +165,9 @@ }, "FROM": "rocker/geospatial:4.2.1", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.2.2.json b/stacks/4.2.2.json index 46490321..f60dc99b 100644 --- a/stacks/4.2.2.json +++ b/stacks/4.2.2.json @@ -165,7 +165,9 @@ }, "FROM": "rocker/geospatial:4.2.2", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.2.3.json b/stacks/4.2.3.json index 267a5bb8..d95509d1 100644 --- a/stacks/4.2.3.json +++ b/stacks/4.2.3.json @@ -179,7 +179,9 @@ }, "FROM": "rocker/geospatial:4.2.3", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh" diff --git a/stacks/4.3.0.json b/stacks/4.3.0.json index 2b75c905..9bfd3a48 100644 --- a/stacks/4.3.0.json +++ b/stacks/4.3.0.json @@ -169,7 +169,9 @@ }, "FROM": "rocker/geospatial:4.3.0", "ENV": { - "NB_USER": "rstudio" + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" }, "RUN": [ "/rocker_scripts/install_jupyter.sh"