test commit 3

StatCan · Dec 29, 2024 · 70320c0 · 70320c0
1 parent 827c44e
commit 70320c0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 42 deletions.
diff --git a/docker-bits/∞_CMD.Dockerfile b/docker-bits/∞_CMD.Dockerfile
@@ -23,12 +23,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
 

diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile
@@ -29,12 +29,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
 

diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -588,12 +588,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
 

diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh
@@ -247,6 +247,24 @@ local({
 EOF
 fi
 
+# Check if the directory exists
+if [ ! -d /home/$NB_USER/test ]; then
+  # Directory does not exist, create it
+  mkdir -p /home/$NB_USER/test
+  echo "Directory test created."
+else
+  echo "Directory test already exists."
+fi
+
+DIR="/home/$NB_USER/.gnupg"
+
+if [ -d "$DIR" ]; then
+  chmod 700 "$DIR"
+  echo "Permissions for $DIR set to 700."
+else
+  echo "Directory $DIR does not exist."
+fi
+
 echo "--------------------starting jupyter--------------------"
 
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \

diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -610,12 +610,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
 

diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -717,12 +717,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
 

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -328,12 +328,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system
 

diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -572,12 +572,6 @@ COPY .Rprofile /tmp/.Rprofile
 # Copy over Instructions to Home directory
 ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md
 
-RUN if [ -d "/home/jovyan/.gnupg" ]; then \
-      chmod 700 /home/jovyan/.gnupg; \
-    fi
-
-RUN mkdir /home/jovyan/test
-
 # Point conda to Artifactory repository
 RUN conda config --remove channels conda-forge --system