Merge pull request #191 from nmfs-opensci/eeholmes-patch-1

Update start

Dockerfile

@@ -46,14 +46,13 @@ RUN mkdir -p ${NB_PYTHON_PREFIX}/etc/jupyter/jupyter_server_config.d/ && \
     cp ${REPO_DIR}/custom_jupyter_server_config.json ${NB_PYTHON_PREFIX}/etc/jupyter/jupyter_notebook_config.d/
 
 # Set up the defaults for Desktop. Keep config in the base so doesn't trash user environment
-# ENV XDG_CONFIG_HOME=/etc/xdg/userconfig
-# RUN mkdir -p /etc/xdg/userconfig && \
-#    chown -R ${NB_USER}:${NB_USER} ${XDG_CONFIG_HOME} && \
-#    chmod -R u+rwx,g+rwX,o+rX ${XDG_CONFIG_HOME} 
-# && \
-#    mv ${REPO_DIR}/user-dirs.dirs ${XDG_CONFIG_HOME} && \
-#    chmod +x ${REPO_DIR}/desktop.sh && \
-#   ${REPO_DIR}/desktop.sh
+ENV XDG_CONFIG_HOME=/etc/xdg/userconfig
+RUN mkdir -p /etc/xdg/userconfig && \
+    chown -R ${NB_USER}:${NB_USER} ${XDG_CONFIG_HOME} && \
+    chmod -R u+rwx,g+rwX,o+rX ${XDG_CONFIG_HOME} && \
+    mv ${REPO_DIR}/user-dirs.dirs ${XDG_CONFIG_HOME} && \
+    chmod +x ${REPO_DIR}/desktop.sh && \
+    ${REPO_DIR}/desktop.sh
 
 # Set up the start command 
 USER ${NB_USER}

start

@@ -6,7 +6,9 @@ set -euo pipefail
 # USE export <parname>=value
 # source this file to get the variables defined in the rocker Dockerfile
 # this is a series of export cmds
-source ${REPO_DIR}/env.txt
+if [ -f "${REPO_DIR}/env.txt" ]; then
+    source "${REPO_DIR}/env.txt"
+fi
 # End - Set any environment variables here
 
 # Run child start scripts in a subshell to contain its environment