Add safe version of rm to prevent deletion of filers. (#648)

* add safe version of rm * move rm wrapper to github gist * move rm wrapper to github gist * add safe version of rm via github gist * fix typo * fix typo * fix typo * change location of script: github -> gitlab --------- Co-authored-by: Bryan Paget <[email protected]>
StatCan · Jul 17, 2024 · 8a01153 · 8a01153
1 parent f1d4ef0
commit 8a01153
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 7 deletions.
diff --git a/docker-bits/∞_CMD.Dockerfile b/docker-bits/∞_CMD.Dockerfile
@@ -25,7 +25,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile
@@ -31,7 +31,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -467,7 +467,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -489,7 +489,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -596,7 +596,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -281,7 +281,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -519,7 +519,7 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
-    
+
 USER $NB_USER
 ENTRYPOINT ["tini", "--"]
 CMD ["start-custom.sh"]
diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"
 

diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh
@@ -44,6 +44,14 @@ if [ ! -f /home/$NB_USER/.zsh-installed ]; then
     touch /home/$NB_USER/.hushlogin
 fi
 
+# add rm wrapper:
+# https://jirab.statcan.ca/browse/ZPS-40
+mkdir -p /home/$NB_USER/.local/bin/
+git clone https://gitlab.k8s.cloud.statcan.ca/zone/build-scripts/snippets/415.git /home/$NB_USER/.local/bin/rm-git
+mv /home/$NB_USER/.local/bin/rm-git/rm /home/$NB_USER/.local/bin/rm
+rm -rf /home/$NB_USER/.local/bin/rm-git
+chmod +x /home/$NB_USER/.local/bin/rm
+
 export VISUAL="/usr/bin/nano"
 export EDITOR="$VISUAL"