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: diff --git a/docker-bits/6_sas.Dockerfile b/docker-bits/6_sas.Dockerfile index 07f445a27..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/ && \ @@ -28,6 +30,9 @@ 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_TEMP_HOME/preferences/SWE.folderShortcuts.key + 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/docker-stacks-datascience-notebook/start-custom.sh b/output/docker-stacks-datascience-notebook/start-custom.sh index d39738d8a..ef668524b 100755 --- a/output/docker-stacks-datascience-notebook/start-custom.sh +++ b/output/docker-stacks-datascience-notebook/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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..ef668524b 100755 --- a/output/jupyterlab-cpu/start-custom.sh +++ b/output/jupyterlab-cpu/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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..ef668524b 100755 --- a/output/jupyterlab-pytorch/start-custom.sh +++ b/output/jupyterlab-pytorch/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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..ef668524b 100755 --- a/output/jupyterlab-tensorflow/start-custom.sh +++ b/output/jupyterlab-tensorflow/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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..ef668524b 100755 --- a/output/remote-desktop/start-custom.sh +++ b/output/remote-desktop/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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..ef668524b 100755 --- a/output/rstudio/start-custom.sh +++ b/output/rstudio/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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 cf9ce6f3c..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/ && \ @@ -414,6 +416,9 @@ 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_TEMP_HOME/preferences/SWE.folderShortcuts.key + 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..a7b5ac93a --- /dev/null +++ b/output/sas/SWE.folderShortcuts.key @@ -0,0 +1 @@ +["Workspace~ps~/home/jovyan/workspace"] \ No newline at end of file diff --git a/output/sas/start-custom.sh b/output/sas/start-custom.sh index d39738d8a..ef668524b 100755 --- a/output/sas/start-custom.sh +++ b/output/sas/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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/resources/common/start-custom.sh b/resources/common/start-custom.sh index d39738d8a..ef668524b 100755 --- a/resources/common/start-custom.sh +++ b/resources/common/start-custom.sh @@ -158,6 +158,15 @@ if [ ! -d "$HOME/workspace" ]; then mkdir -p "$HOME/workspace/repositories" fi +# Add sasstudio default +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 + # 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/resources/sas/SWE.folderShortcuts.key b/resources/sas/SWE.folderShortcuts.key new file mode 100644 index 000000000..a7b5ac93a --- /dev/null +++ b/resources/sas/SWE.folderShortcuts.key @@ -0,0 +1 @@ +["Workspace~ps~/home/jovyan/workspace"] \ No newline at end of file