diff --git a/docker-bits/6_jupyterlab.Dockerfile b/docker-bits/6_jupyterlab.Dockerfile index 663f4bd07..27318a033 100644 --- a/docker-bits/6_jupyterlab.Dockerfile +++ b/docker-bits/6_jupyterlab.Dockerfile @@ -65,6 +65,7 @@ RUN pip install \ 'plotly' \ 'ipywidgets' \ 'markupsafe' \ + 'pyspark' \ 'ipympl' \ 'pexpect==4.9.0' \ 'jupyter-resource-usage' \ diff --git a/docker-bits/6_rstudio.Dockerfile b/docker-bits/6_rstudio.Dockerfile index 7697cab44..7fe5ba430 100644 --- a/docker-bits/6_rstudio.Dockerfile +++ b/docker-bits/6_rstudio.Dockerfile @@ -12,6 +12,8 @@ RUN mkdir -p /etc/rstudio && \ ENV PATH=$PATH:/usr/lib/rstudio-server/bin +ENV SPARK_HOME="/opt/conda/lib/python3.11/site-packages/pyspark" + # Install some default R packages RUN mamba install --quiet --yes \ 'r-arrow' \ @@ -24,6 +26,7 @@ RUN mamba install --quiet --yes \ 'r-renv' \ 'r-rodbc' \ 'r-sf' \ + 'r-sparklyr' \ 'r-tidyverse' \ && \ clean-layer.sh && \ @@ -31,10 +34,10 @@ RUN mamba install --quiet --yes \ fix-permissions /home/$NB_USER RUN python3 -m pip install \ - 'jupyter-rsession-proxy==2.2.0' \ - 'jupyter-server-proxy==4.2.0' && \ - fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER + 'jupyter-rsession-proxy==2.2.0' \ + 'jupyter-server-proxy==4.2.0' && \ + fix-permissions $CONDA_DIR && \ + fix-permissions /home/$NB_USER # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 62449118c..11bfefdb1 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -243,6 +243,8 @@ RUN mkdir -p /etc/rstudio && \ ENV PATH=$PATH:/usr/lib/rstudio-server/bin +ENV SPARK_HOME="/opt/conda/lib/python3.11/site-packages/pyspark" + # Install some default R packages RUN mamba install --quiet --yes \ 'r-arrow' \ @@ -255,6 +257,7 @@ RUN mamba install --quiet --yes \ 'r-renv' \ 'r-rodbc' \ 'r-sf' \ + 'r-sparklyr' \ 'r-tidyverse' \ && \ clean-layer.sh && \ @@ -262,10 +265,10 @@ RUN mamba install --quiet --yes \ fix-permissions /home/$NB_USER RUN python3 -m pip install \ - 'jupyter-rsession-proxy==2.2.0' \ - 'jupyter-server-proxy==4.2.0' && \ - fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER + 'jupyter-rsession-proxy==2.2.0' \ + 'jupyter-server-proxy==4.2.0' && \ + fix-permissions $CONDA_DIR && \ + fix-permissions /home/$NB_USER # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" @@ -342,6 +345,7 @@ RUN pip install \ 'plotly' \ 'ipywidgets' \ 'markupsafe' \ + 'pyspark' \ 'ipympl' \ 'pexpect==4.9.0' \ 'jupyter-resource-usage' \ diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index b307e8ec9..e63edc78c 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -265,6 +265,8 @@ RUN mkdir -p /etc/rstudio && \ ENV PATH=$PATH:/usr/lib/rstudio-server/bin +ENV SPARK_HOME="/opt/conda/lib/python3.11/site-packages/pyspark" + # Install some default R packages RUN mamba install --quiet --yes \ 'r-arrow' \ @@ -277,6 +279,7 @@ RUN mamba install --quiet --yes \ 'r-renv' \ 'r-rodbc' \ 'r-sf' \ + 'r-sparklyr' \ 'r-tidyverse' \ && \ clean-layer.sh && \ @@ -284,10 +287,10 @@ RUN mamba install --quiet --yes \ fix-permissions /home/$NB_USER RUN python3 -m pip install \ - 'jupyter-rsession-proxy==2.2.0' \ - 'jupyter-server-proxy==4.2.0' && \ - fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER + 'jupyter-rsession-proxy==2.2.0' \ + 'jupyter-server-proxy==4.2.0' && \ + fix-permissions $CONDA_DIR && \ + fix-permissions /home/$NB_USER # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" @@ -364,6 +367,7 @@ RUN pip install \ 'plotly' \ 'ipywidgets' \ 'markupsafe' \ + 'pyspark' \ 'ipympl' \ 'pexpect==4.9.0' \ 'jupyter-resource-usage' \ diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index a0610abea..1be4277fd 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -372,6 +372,8 @@ RUN mkdir -p /etc/rstudio && \ ENV PATH=$PATH:/usr/lib/rstudio-server/bin +ENV SPARK_HOME="/opt/conda/lib/python3.11/site-packages/pyspark" + # Install some default R packages RUN mamba install --quiet --yes \ 'r-arrow' \ @@ -384,6 +386,7 @@ RUN mamba install --quiet --yes \ 'r-renv' \ 'r-rodbc' \ 'r-sf' \ + 'r-sparklyr' \ 'r-tidyverse' \ && \ clean-layer.sh && \ @@ -391,10 +394,10 @@ RUN mamba install --quiet --yes \ fix-permissions /home/$NB_USER RUN python3 -m pip install \ - 'jupyter-rsession-proxy==2.2.0' \ - 'jupyter-server-proxy==4.2.0' && \ - fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER + 'jupyter-rsession-proxy==2.2.0' \ + 'jupyter-server-proxy==4.2.0' && \ + fix-permissions $CONDA_DIR && \ + fix-permissions /home/$NB_USER # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" @@ -471,6 +474,7 @@ RUN pip install \ 'plotly' \ 'ipywidgets' \ 'markupsafe' \ + 'pyspark' \ 'ipympl' \ 'pexpect==4.9.0' \ 'jupyter-resource-usage' \ diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 7e6c1760e..0166d038b 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -243,6 +243,8 @@ RUN mkdir -p /etc/rstudio && \ ENV PATH=$PATH:/usr/lib/rstudio-server/bin +ENV SPARK_HOME="/opt/conda/lib/python3.11/site-packages/pyspark" + # Install some default R packages RUN mamba install --quiet --yes \ 'r-arrow' \ @@ -255,6 +257,7 @@ RUN mamba install --quiet --yes \ 'r-renv' \ 'r-rodbc' \ 'r-sf' \ + 'r-sparklyr' \ 'r-tidyverse' \ && \ clean-layer.sh && \ @@ -262,10 +265,10 @@ RUN mamba install --quiet --yes \ fix-permissions /home/$NB_USER RUN python3 -m pip install \ - 'jupyter-rsession-proxy==2.2.0' \ - 'jupyter-server-proxy==4.2.0' && \ - fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER + 'jupyter-rsession-proxy==2.2.0' \ + 'jupyter-server-proxy==4.2.0' && \ + fix-permissions $CONDA_DIR && \ + fix-permissions /home/$NB_USER # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index d614f353c..45fa2aed7 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -276,6 +276,7 @@ RUN pip install \ 'plotly' \ 'ipywidgets' \ 'markupsafe' \ + 'pyspark' \ 'ipympl' \ 'pexpect==4.9.0' \ 'jupyter-resource-usage' \ @@ -402,6 +403,8 @@ RUN mkdir -p /etc/rstudio && \ ENV PATH=$PATH:/usr/lib/rstudio-server/bin +ENV SPARK_HOME="/opt/conda/lib/python3.11/site-packages/pyspark" + # Install some default R packages RUN mamba install --quiet --yes \ 'r-arrow' \ @@ -414,6 +417,7 @@ RUN mamba install --quiet --yes \ 'r-renv' \ 'r-rodbc' \ 'r-sf' \ + 'r-sparklyr' \ 'r-tidyverse' \ && \ clean-layer.sh && \ @@ -421,10 +425,10 @@ RUN mamba install --quiet --yes \ fix-permissions /home/$NB_USER RUN python3 -m pip install \ - 'jupyter-rsession-proxy==2.2.0' \ - 'jupyter-server-proxy==4.2.0' && \ - fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER + 'jupyter-rsession-proxy==2.2.0' \ + 'jupyter-server-proxy==4.2.0' && \ + fix-permissions $CONDA_DIR && \ + fix-permissions /home/$NB_USER # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio"