moved logic to start-custom script

StatCan · Jul 8, 2024 · d79a0f0 · d79a0f0
1 parent 21559c2
commit d79a0f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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`