From 40c6b7230ac3ff3fa717543c2e9e4d30725f327c Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Thu, 4 Jul 2024 19:41:37 +0000 Subject: [PATCH 01/11] added file for sas file shortcut --- docker-bits/6_sas.Dockerfile | 3 +++ output/sas/Dockerfile | 3 +++ output/sas/SWE.folderShortcuts.key | 1 + resources/sas/SWE.folderShortcuts.key | 1 + 4 files changed, 8 insertions(+) create mode 100644 output/sas/SWE.folderShortcuts.key create mode 100644 resources/sas/SWE.folderShortcuts.key diff --git a/docker-bits/6_sas.Dockerfile b/docker-bits/6_sas.Dockerfile index 07f445a27..fb2903efb 100644 --- a/docker-bits/6_sas.Dockerfile +++ b/docker-bits/6_sas.Dockerfile @@ -28,6 +28,9 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan +# Adds default workdir shortcut to sasstudio +COPY SWE.folderShortcuts.key .sasstudio/preferences + ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin ENV PATH=$PATH:/usr/local/SASHome/SASPrivateJavaRuntimeEnvironment/9.4/jre/bin diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index cf9ce6f3c..9969ba943 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -414,6 +414,9 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan +# Adds default workdir shortcut to sasstudio +COPY SWE.folderShortcuts.key .sasstudio/preferences + ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin ENV PATH=$PATH:/usr/local/SASHome/SASPrivateJavaRuntimeEnvironment/9.4/jre/bin diff --git a/output/sas/SWE.folderShortcuts.key b/output/sas/SWE.folderShortcuts.key new file mode 100644 index 000000000..e4b353e57 --- /dev/null +++ b/output/sas/SWE.folderShortcuts.key @@ -0,0 +1 @@ +["{SAS002}V29ya3NwYWNl~ps~/home/jovyan/workspace"] \ No newline at end of file diff --git a/resources/sas/SWE.folderShortcuts.key b/resources/sas/SWE.folderShortcuts.key new file mode 100644 index 000000000..e4b353e57 --- /dev/null +++ b/resources/sas/SWE.folderShortcuts.key @@ -0,0 +1 @@ +["{SAS002}V29ya3NwYWNl~ps~/home/jovyan/workspace"] \ No newline at end of file From 74629999c1422b7d8bfba38a3853e703c853b3b6 Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Thu, 4 Jul 2024 19:49:00 +0000 Subject: [PATCH 02/11] triggering CI --- docker-bits/6_sas.Dockerfile | 2 +- output/sas/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bits/6_sas.Dockerfile b/docker-bits/6_sas.Dockerfile index fb2903efb..5b467c452 100644 --- a/docker-bits/6_sas.Dockerfile +++ b/docker-bits/6_sas.Dockerfile @@ -28,7 +28,7 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan -# Adds default workdir shortcut to sasstudio +# Adds default workspace shortcut to sasstudio COPY SWE.folderShortcuts.key .sasstudio/preferences ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 9969ba943..a668c6a34 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -414,7 +414,7 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan -# Adds default workdir shortcut to sasstudio +# Adds default workspace shortcut to sasstudio COPY SWE.folderShortcuts.key .sasstudio/preferences ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin From 9798b1fb8f34d5c301ae59d4bafdccf6982abfd6 Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Fri, 5 Jul 2024 13:16:33 +0000 Subject: [PATCH 03/11] fix copy path --- docker-bits/6_sas.Dockerfile | 2 +- output/sas/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bits/6_sas.Dockerfile b/docker-bits/6_sas.Dockerfile index 5b467c452..ba2df65ab 100644 --- a/docker-bits/6_sas.Dockerfile +++ b/docker-bits/6_sas.Dockerfile @@ -29,7 +29,7 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan # Adds default workspace shortcut to sasstudio -COPY SWE.folderShortcuts.key .sasstudio/preferences +COPY SWE.folderShortcuts.key .sasstudio/preferences/SWE.folderShortcuts.key ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index a668c6a34..1af192f22 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -415,7 +415,7 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan # Adds default workspace shortcut to sasstudio -COPY SWE.folderShortcuts.key .sasstudio/preferences +COPY SWE.folderShortcuts.key .sasstudio/preferences/SWE.folderShortcuts.key ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin From 21559c2b69e2128a4e26ba0aa48de1f4c8c25729 Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Fri, 5 Jul 2024 14:40:24 +0000 Subject: [PATCH 04/11] updated copy path --- docker-bits/6_sas.Dockerfile | 3 ++- output/sas/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-bits/6_sas.Dockerfile b/docker-bits/6_sas.Dockerfile index ba2df65ab..1cc7d76ba 100644 --- a/docker-bits/6_sas.Dockerfile +++ b/docker-bits/6_sas.Dockerfile @@ -29,7 +29,8 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan # Adds default workspace shortcut to sasstudio -COPY SWE.folderShortcuts.key .sasstudio/preferences/SWE.folderShortcuts.key +COPY SWE.folderShortcuts.key /home/jovyan/.sasstudio/preferences/SWE.folderShortcuts.key +COPY SWE.folderShortcuts.key /home/jovyan/SWE.folderShortcuts.key ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 1af192f22..5c964ab3f 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -415,7 +415,8 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan # Adds default workspace shortcut to sasstudio -COPY SWE.folderShortcuts.key .sasstudio/preferences/SWE.folderShortcuts.key +COPY SWE.folderShortcuts.key /home/jovyan/.sasstudio/preferences/SWE.folderShortcuts.key +COPY SWE.folderShortcuts.key /home/jovyan/SWE.folderShortcuts.key ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin From d79a0f08f02c9797d49bccc7b34db76243b53ad1 Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Mon, 8 Jul 2024 13:22:28 +0000 Subject: [PATCH 05/11] moved logic to start-custom script --- docker-bits/6_sas.Dockerfile | 5 +++-- resources/common/start-custom.sh | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker-bits/6_sas.Dockerfile b/docker-bits/6_sas.Dockerfile index 1cc7d76ba..796dbf725 100644 --- a/docker-bits/6_sas.Dockerfile +++ b/docker-bits/6_sas.Dockerfile @@ -5,6 +5,8 @@ ARG QUARTO_VERSION=1.4.176 ARG QUARTO_SHA=c06edd8930903a1018a27eb9f70fb9037b28a3cd8a7eb6299e8136876b4e11b3 ARG QUARTO_URL=https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz +ENV SASSTUDIO_TEMP_HOME=/etc/sasstudio + RUN wget -q ${QUARTO_URL} -O /tmp/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz && \ echo "${QUARTO_SHA} /tmp/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | sha256sum -c - && \ tar -xzvf /tmp/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz -C /tmp/ && \ @@ -29,8 +31,7 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan # Adds default workspace shortcut to sasstudio -COPY SWE.folderShortcuts.key /home/jovyan/.sasstudio/preferences/SWE.folderShortcuts.key -COPY SWE.folderShortcuts.key /home/jovyan/SWE.folderShortcuts.key +COPY SWE.folderShortcuts.key $SASSTUDIO_TEMP_HOME/preferences/SWE.folderShortcuts.key ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/resources/common/start-custom.sh +++ b/resources/common/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` From 9245d335e0cd801d97d117dd816d6404fabc1202 Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Mon, 8 Jul 2024 13:25:06 +0000 Subject: [PATCH 06/11] ran generate-dockerfiles --- output/docker-stacks-datascience-notebook/start-custom.sh | 7 +++++++ output/jupyterlab-cpu/start-custom.sh | 7 +++++++ output/jupyterlab-pytorch/start-custom.sh | 7 +++++++ output/jupyterlab-tensorflow/start-custom.sh | 7 +++++++ output/remote-desktop/start-custom.sh | 7 +++++++ output/rstudio/start-custom.sh | 7 +++++++ output/sas/Dockerfile | 5 +++-- output/sas/start-custom.sh | 7 +++++++ 8 files changed, 52 insertions(+), 2 deletions(-) diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/docker-stacks-datascience-notebook/start-custom.sh +++ b/output/docker-stacks-datascience-notebook/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/jupyterlab-cpu/start-custom.sh +++ b/output/jupyterlab-cpu/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/jupyterlab-pytorch/start-custom.sh +++ b/output/jupyterlab-pytorch/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/jupyterlab-tensorflow/start-custom.sh +++ b/output/jupyterlab-tensorflow/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/remote-desktop/start-custom.sh +++ b/output/remote-desktop/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/rstudio/start-custom.sh +++ b/output/rstudio/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 5c964ab3f..fd6af7a9d 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -391,6 +391,8 @@ ARG QUARTO_VERSION=1.4.176 ARG QUARTO_SHA=c06edd8930903a1018a27eb9f70fb9037b28a3cd8a7eb6299e8136876b4e11b3 ARG QUARTO_URL=https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz +ENV SASSTUDIO_TEMP_HOME=/etc/sasstudio + RUN wget -q ${QUARTO_URL} -O /tmp/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz && \ echo "${QUARTO_SHA} /tmp/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz" | sha256sum -c - && \ tar -xzvf /tmp/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz -C /tmp/ && \ @@ -415,8 +417,7 @@ RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && WORKDIR /home/jovyan # Adds default workspace shortcut to sasstudio -COPY SWE.folderShortcuts.key /home/jovyan/.sasstudio/preferences/SWE.folderShortcuts.key -COPY SWE.folderShortcuts.key /home/jovyan/SWE.folderShortcuts.key +COPY SWE.folderShortcuts.key $SASSTUDIO_TEMP_HOME/preferences/SWE.folderShortcuts.key ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh index d39738d8a..6b5cdf9b9 100755 --- a/output/sas/start-custom.sh +++ b/output/sas/start-custom.sh @@ -158,6 +158,13 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +if [ ! -d "$HOME/.sasstudio" ]; then + echo "Creating sasstudio default settings" + mkdir -p "$HOME/.sasstudio" + cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" +fi + # Retrieve service account details serviceaccountname=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Username}} | base64 --decode` serviceaccounttoken=`kubectl get secret artifactory-creds -n $NB_NAMESPACE --template={{.data.Token}} | base64 --decode` From bcf4e1689da68bb1ad61145b5e94f68fb5b471fc Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Mon, 15 Jul 2024 16:24:56 +0000 Subject: [PATCH 07/11] updated start-custom script --- output/docker-stacks-datascience-notebook/start-custom.sh | 6 ++++-- output/jupyterlab-cpu/start-custom.sh | 6 ++++-- output/jupyterlab-pytorch/start-custom.sh | 6 ++++-- output/jupyterlab-tensorflow/start-custom.sh | 6 ++++-- output/remote-desktop/start-custom.sh | 6 ++++-- output/rstudio/start-custom.sh | 6 ++++-- output/sas/start-custom.sh | 6 ++++-- resources/common/start-custom.sh | 6 ++++-- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/output/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/docker-stacks-datascience-notebook/start-custom.sh +++ b/output/docker-stacks-datascience-notebook/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/output/jupyterlab-cpu/start-custom.sh b/output/jupyterlab-cpu/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/jupyterlab-cpu/start-custom.sh +++ b/output/jupyterlab-cpu/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/output/jupyterlab-pytorch/start-custom.sh b/output/jupyterlab-pytorch/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/jupyterlab-pytorch/start-custom.sh +++ b/output/jupyterlab-pytorch/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/output/jupyterlab-tensorflow/start-custom.sh b/output/jupyterlab-tensorflow/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/jupyterlab-tensorflow/start-custom.sh +++ b/output/jupyterlab-tensorflow/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/output/remote-desktop/start-custom.sh b/output/remote-desktop/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/remote-desktop/start-custom.sh +++ b/output/remote-desktop/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/output/rstudio/start-custom.sh b/output/rstudio/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/rstudio/start-custom.sh +++ b/output/rstudio/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/output/sas/start-custom.sh +++ b/output/sas/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi diff --git a/resources/common/start-custom.sh b/resources/common/start-custom.sh index 6b5cdf9b9..ef668524b 100755 --- a/resources/common/start-custom.sh +++ b/resources/common/start-custom.sh @@ -159,8 +159,10 @@ if [ ! -d "$HOME/workspace" ]; then fi # Add sasstudio default -if [ ! -d "$HOME/.sasstudio" ]; then - echo "Creating sasstudio default settings" +if [[ -z "${SASSTUDIO_TEMP_HOME}" ]]; then + echo "No sas studio default settings created" +else + echo "Creating sas studio default settings" mkdir -p "$HOME/.sasstudio" cp -r "$SASSTUDIO_TEMP_HOME/." "$HOME/.sasstudio" fi From 6d6831afdb5d70e468fe57580a5774689e619a5d Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Mon, 15 Jul 2024 19:15:20 +0000 Subject: [PATCH 08/11] updated shortcut file --- resources/sas/SWE.folderShortcuts.key | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/sas/SWE.folderShortcuts.key b/resources/sas/SWE.folderShortcuts.key index e4b353e57..7ba3f57ed 100644 --- a/resources/sas/SWE.folderShortcuts.key +++ b/resources/sas/SWE.folderShortcuts.key @@ -1 +1 @@ -["{SAS002}V29ya3NwYWNl~ps~/home/jovyan/workspace"] \ No newline at end of file +["workspace~ps~/home/jovyan/workspace"] \ No newline at end of file From c8f9d34ce5514c2ad0760adb334e30012642618f Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Mon, 15 Jul 2024 19:20:51 +0000 Subject: [PATCH 09/11] ran make generate dockerfiles --- output/sas/SWE.folderShortcuts.key | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output/sas/SWE.folderShortcuts.key b/output/sas/SWE.folderShortcuts.key index e4b353e57..7ba3f57ed 100644 --- a/output/sas/SWE.folderShortcuts.key +++ b/output/sas/SWE.folderShortcuts.key @@ -1 +1 @@ -["{SAS002}V29ya3NwYWNl~ps~/home/jovyan/workspace"] \ No newline at end of file +["workspace~ps~/home/jovyan/workspace"] \ No newline at end of file From e5448e07f91f608072c89fd9319e228ead69a95f Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Tue, 16 Jul 2024 13:51:18 +0000 Subject: [PATCH 10/11] updated shortcut name --- output/sas/SWE.folderShortcuts.key | 2 +- resources/sas/SWE.folderShortcuts.key | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/output/sas/SWE.folderShortcuts.key b/output/sas/SWE.folderShortcuts.key index 7ba3f57ed..a7b5ac93a 100644 --- a/output/sas/SWE.folderShortcuts.key +++ b/output/sas/SWE.folderShortcuts.key @@ -1 +1 @@ -["workspace~ps~/home/jovyan/workspace"] \ No newline at end of file +["Workspace~ps~/home/jovyan/workspace"] \ No newline at end of file diff --git a/resources/sas/SWE.folderShortcuts.key b/resources/sas/SWE.folderShortcuts.key index 7ba3f57ed..a7b5ac93a 100644 --- a/resources/sas/SWE.folderShortcuts.key +++ b/resources/sas/SWE.folderShortcuts.key @@ -1 +1 @@ -["workspace~ps~/home/jovyan/workspace"] \ No newline at end of file +["Workspace~ps~/home/jovyan/workspace"] \ No newline at end of file From 98b094cef151e989b4a1fa1b7af632813a6637bc Mon Sep 17 00:00:00 2001 From: Mathis Marcotte Date: Tue, 16 Jul 2024 15:15:48 +0000 Subject: [PATCH 11/11] removed remote desktop from workflow --- .github/workflows/build_push.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_push.yaml index d768e13f4..cfe63385e 100644 --- a/.github/workflows/build_push.yaml +++ b/.github/workflows/build_push.yaml @@ -74,7 +74,6 @@ jobs: - jupyterlab-cpu - jupyterlab-pytorch - jupyterlab-tensorflow - - remote-desktop needs: pre-build-checks runs-on: ubuntu-latest services: