updated start up script

StatCan · Jul 31, 2024 · 5eca781 · 5eca781
1 parent 84aba4b
commit 5eca781
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 29 deletions.
diff --git a/docker-bits/4_CLI.Dockerfile b/docker-bits/4_CLI.Dockerfile
@@ -95,6 +95,3 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && echo "${GIT_CRED_MANAGER_SHA}  ./gcm.deb" | sha256sum -c - \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
-
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -153,9 +153,6 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
 
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
-
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile
 ###############################

diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -175,9 +175,6 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
 
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
-
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile
 ###############################

diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -282,9 +282,6 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
 
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
-
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile
 ###############################

diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/output/remote-desktop/Dockerfile b/output/remote-desktop/Dockerfile
@@ -228,9 +228,6 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
 
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
-
 ###############################
 ###  docker-bits/6_remote-desktop.Dockerfile
 ###############################

diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -153,9 +153,6 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
 
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
-
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile
 ###############################

diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -155,9 +155,6 @@ RUN wget -q "${GIT_CRED_MANAGER_URL}" -O ./gcm.deb \
   && dpkg -i ./gcm.deb \
   && rm ./gcm.deb
 
-# Sets git credential manager to use gpg
-ENV GCM_CREDENTIAL_STORE=gpg
-
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile
 ###############################

diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \

diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh
@@ -13,6 +13,11 @@ else
   sleep infinity
 fi
 
+# Step up Git Credential Manager
+git config --global credential.credentialStore gpg
+git config --global credential.helper manager
+echo "export GPG_TTY=$(tty)" >> ~/.bashrc
+
 # Clone example notebooks (with retries)
 RETRIES_NO=5
 RETRY_DELAY=3
@@ -196,7 +201,8 @@ EOF
 fi
 
 echo "--------------------starting jupyter--------------------"
-
+echo "$(tty)"
+echo $(tty)
 /opt/conda/bin/jupyter server --notebook-dir=/home/${NB_USER} \
                  --ip=0.0.0.0 \
                  --no-browser \