Skip to content

Commit

Permalink
modify start-custom
Browse files Browse the repository at this point in the history
  • Loading branch information
@wg102
wg102 committed Jun 24, 2024
1 parent f5ea59d commit dc85ab6
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 34 deletions.
1 change: 0 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 0 additions & 3 deletions docker-bits/6_rstudio.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions output/docker-stacks-datascience-notebook/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions output/jupyterlab-cpu/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions output/jupyterlab-pytorch/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions output/jupyterlab-tensorflow/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions output/remote-desktop/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions output/rstudio/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions output/rstudio/r_env_variable.sh
View file

This file was deleted.

4 changes: 4 additions & 0 deletions output/rstudio/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions output/sas/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions output/sas/r_env_variable.sh
View file

This file was deleted.

4 changes: 4 additions & 0 deletions output/sas/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions resources/common/start-custom.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions resources/rstudio/r_env_variable.sh
View file

This file was deleted.

6 changes: 0 additions & 6 deletions resources/sas/r_env_variable.sh
View file

This file was deleted.

0 comments on commit dc85ab6

Please sign in to comment.