Merge pull request #985 from SyneRBI/startup-hooks

Author: casperdcl

Dockerfile

@@ -27,6 +27,7 @@ COPY docker/requirements.yml /opt/scripts/
 # https://github.com/TomographicImaging/CIL/blob/master/Dockerfile
 RUN if test "$BUILD_GPU" != 0; then \
   sed -ri 's/^(\s*)#\s*(- \S+.*#.*GPU.*)$/\1\2/' /opt/scripts/requirements.yml; \
+  echo 'cuda-version 12.9.*' >> "${CONDA_DIR}/conda-meta/pinned"; \
  fi \
  && mamba env update -n base -f /opt/scripts/requirements.yml \
  && mamba clean --all -f -y && fix-permissions "${CONDA_DIR}" /home/${NB_USER}
@@ -132,8 +133,6 @@ ENV RESTARTABLE="yes"
 EXPOSE 9002
 ENV GADGETRON_RELAY_HOST="0.0.0.0"
 
-# run gadgetron in the background before start-notebook.py
-COPY --link --chown=${NB_USER} docker/start-gadgetron-notebook.sh /opt/scripts/
 # COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/lib /opt/conda/lib
-COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/bin/env_sirf.sh /opt/conda/etc/conda/activate.d
-CMD ["/opt/scripts/start-gadgetron-notebook.sh"]
+COPY --link docker/15source-sirf.sh docker/25clone-work.sh docker/35gadgetron.sh /usr/local/bin/before-notebook.d/
+ENV NOTEBOOK_ARGS=--PasswordIdentityProvider.hashed_password='sha1:cbf03843d2bb:8729d2fbec60cacf6485758752789cd9989e756c'

docker/15source-sirf.sh

@@ -0,0 +1 @@
+source /opt/SIRF-SuperBuild/INSTALL/bin/env_sirf.sh

docker/25clone-work.sh

@@ -0,0 +1,17 @@
+if test $UID -eq 0; then
+  sudo --preserve-env --set-home --user "$NB_USER" "$0" "$@"
+  exit $?
+fi
+SB_PATH=$(dirname "$(dirname "$SIRF_PATH")")
+pushd ~/work
+for repo in SIRF-Exercises CIL-Demos; do
+  test -d ${repo} || cp -dR "${SB_PATH}/../${repo}" .
+done
+./SIRF-Exercises/scripts/download_data.sh ${SIRF_DOWNLOAD_DATA_ARGS:-}
+
+echo "link SIRF-Contrib into ~/work"
+if test ! -r SIRF-contrib; then
+  echo "Creating link to SIRF-contrib"
+  ln -s "${SIRF_INSTALL_PATH}/python/sirf/contrib" SIRF-contrib
+fi
+popd

docker/35gadgetron.sh

@@ -0,0 +1,3 @@
+pushd /opt/SIRF-SuperBuild
+test -x ./INSTALL/bin/gadgetron && ./INSTALL/bin/gadgetron >& ~/gadgetron.log&
+popd