diff --git a/Makefile b/Makefile index cb11c845b..1a335be99 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,6 @@ cpu: .output rstudio: cpu mkdir -p $(OUT)/$@ cp -r resources/common/. $(OUT)/$@ - cp -r resources/rstudio/. $(OUT)/$@ $(CAT) \ $(TMP)/$<.Dockerfile \ $(SRC)/3_Kubeflow.Dockerfile \ diff --git a/docker-bits/6_rstudio.Dockerfile b/docker-bits/6_rstudio.Dockerfile index f462a4f34..a7cf7d862 100644 --- a/docker-bits/6_rstudio.Dockerfile +++ b/docker-bits/6_rstudio.Dockerfile @@ -35,9 +35,6 @@ RUN python3 -m pip install \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER -COPY r_env_variable.sh /usr/local/bin/ -RUN r_env_variable.sh $NB_PREFIX $NB_USER Woof - # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" ENV GIT_EXAMPLE_NOTEBOOKS=https://gitlab.k8s.cloud.statcan.ca/business-transformation/aaw/aaw-contrib-r-notebooks.git diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/docker-stacks-datascience-notebook/start-custom.sh +++ b/output/docker-stacks-datascience-notebook/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/jupyterlab-cpu/start-custom.sh +++ b/output/jupyterlab-cpu/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/jupyterlab-pytorch/start-custom.sh +++ b/output/jupyterlab-pytorch/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/jupyterlab-tensorflow/start-custom.sh +++ b/output/jupyterlab-tensorflow/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/remote-desktop/start-custom.sh +++ b/output/remote-desktop/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 28fd5cb1f..1d506f54d 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -217,9 +217,6 @@ RUN python3 -m pip install \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER -COPY r_env_variable.sh /usr/local/bin/ -RUN r_env_variable.sh $NB_PREFIX $NB_USER Woof - # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" ENV GIT_EXAMPLE_NOTEBOOKS=https://gitlab.k8s.cloud.statcan.ca/business-transformation/aaw/aaw-contrib-r-notebooks.git diff --git a/output/rstudio/r_env_variable.sh b/output/rstudio/r_env_variable.sh deleted file mode 100755 index 3ad4d1908..000000000 --- a/output/rstudio/r_env_variable.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Find the env variable, add it to the REnviron file - -echo "NB_PREFIX=${1}" >> /opt/conda/lib/R/etc/Renviron && \ -echo "NB_NAMESPACE=${2}" >> /opt/conda/lib/R/etc/Renviron && \ -echo "Meow=test" >> /opt/conda/lib/R/etc/Renviron && \ -echo "WOOF=${3}" >> /opt/conda/lib/R/etc/Renviron \ No newline at end of file diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/rstudio/start-custom.sh +++ b/output/rstudio/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 6b3e5ecd2..4d721d027 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -370,9 +370,6 @@ RUN python3 -m pip install \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER -COPY r_env_variable.sh /usr/local/bin/ -RUN r_env_variable.sh $NB_PREFIX $NB_USER Woof - # If using the docker bit in other Dockerfiles, this must get written over in a later layer ENV DEFAULT_JUPYTER_URL="/rstudio" ENV GIT_EXAMPLE_NOTEBOOKS=https://gitlab.k8s.cloud.statcan.ca/business-transformation/aaw/aaw-contrib-r-notebooks.git diff --git a/output/sas/r_env_variable.sh b/output/sas/r_env_variable.sh deleted file mode 100755 index 4e7ee1d5e..000000000 --- a/output/sas/r_env_variable.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Find the env variable, add it to the REnviron file - -echo "NB_PREFIX=${1}" >> /opt/conda/lib/R/etc/Renviron && \ -echo "NB_NAMESPACE=$2" >> /opt/conda/lib/R/etc/Renviron && \ -echo "Meow=test" >> /opt/conda/lib/R/etc/Renviron && \ -echo "WOOF=${3}" >> /opt/conda/lib/R/etc/Renviron \ No newline at end of file diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh index 263eb4565..25e41548a 100755 --- a/output/sas/start-custom.sh +++ b/output/sas/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh index 263eb4565..25e41548a 100755 --- a/resources/common/start-custom.sh +++ b/resources/common/start-custom.sh @@ -109,6 +109,10 @@ echo "broken configuration settings removed" export NB_NAMESPACE=$(echo $NB_PREFIX | awk -F '/' '{print $3}') export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" +echo "NB_PREFIX=${NB_PREFIX}" >> /opt/conda/lib/R/etc/Renviron +echo "NB_NAMESPACE=$NB_NAMESPACE" >> /opt/conda/lib/R/etc/Renviron +echo "MEOW=test" >> /opt/conda/lib/R/etc/Renviron + # Revert forced virtualenv, was causing issues with users #export PIP_REQUIRE_VIRTUALENV=true #echo "Checking if Python venv exists" diff --git a/resources/rstudio/r_env_variable.sh b/resources/rstudio/r_env_variable.sh deleted file mode 100755 index 3ad4d1908..000000000 --- a/resources/rstudio/r_env_variable.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Find the env variable, add it to the REnviron file - -echo "NB_PREFIX=${1}" >> /opt/conda/lib/R/etc/Renviron && \ -echo "NB_NAMESPACE=${2}" >> /opt/conda/lib/R/etc/Renviron && \ -echo "Meow=test" >> /opt/conda/lib/R/etc/Renviron && \ -echo "WOOF=${3}" >> /opt/conda/lib/R/etc/Renviron \ No newline at end of file diff --git a/resources/sas/r_env_variable.sh b/resources/sas/r_env_variable.sh deleted file mode 100755 index 4e7ee1d5e..000000000 --- a/resources/sas/r_env_variable.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Find the env variable, add it to the REnviron file - -echo "NB_PREFIX=${1}" >> /opt/conda/lib/R/etc/Renviron && \ -echo "NB_NAMESPACE=$2" >> /opt/conda/lib/R/etc/Renviron && \ -echo "Meow=test" >> /opt/conda/lib/R/etc/Renviron && \ -echo "WOOF=${3}" >> /opt/conda/lib/R/etc/Renviron \ No newline at end of file