Fix notebook builds (#335)

* Fix notebook builds

* Set allow_origin correctly

* Invert quotes

* Refactor startup commands

Author: jacobtomlinson

build/docker-compose.yml

@@ -16,7 +16,7 @@ services:
 
   docker-stacks-foundation:
     build:
-      context: github.com/jupyter/docker-stacks.git#main:docker-stacks-foundation
+      context: github.com/jupyter/docker-stacks.git#main:images/docker-stacks-foundation
       dockerfile: Dockerfile
       args:
         PYTHON_VERSION: "3.10"

notebook/Dockerfile

@@ -71,7 +71,8 @@ RUN mkdir /opt/app \
 # Copy over the example as NB_USER. Unfortuantely we can't use $NB_UID/$NB_GID
 # in the `--chown` statement, so we need to hardcode these values.
 COPY --chown=1000:100 examples/ /home/$NB_USER/examples
-COPY prepare.sh /usr/bin/prepare.sh
+COPY prepare.sh /usr/local/bin/before-notebook.d/
+COPY run.sh /run.sh
 
 # HEALTHCHECK pulled from upstream `base-notebook`
 HEALTHCHECK  --interval=15s --timeout=3s --start-period=5s --retries=3 \
@@ -80,5 +81,5 @@ HEALTHCHECK  --interval=15s --timeout=3s --start-period=5s --retries=3 \
 
 USER $NB_USER
 
-ENTRYPOINT ["tini", "--", "/usr/bin/prepare.sh"]
-CMD ["jupyter", "lab", '--NotebookApp.base_url="${NB_PREFIX:-/}"', '${JUPYTERLAB_ARGS}']
+# CMD ["jupyter", "lab", '--NotebookApp.base_url="${NB_PREFIX:-/}"', '--NotebookApp.allow_origin="*"', '${JUPYTERLAB_ARGS}']
+CMD '/run.sh'

notebook/prepare.sh

@@ -32,7 +32,3 @@ if [ "$EXTRA_PIP_PACKAGES" ]; then
     echo "EXTRA_PIP_PACKAGES environment variable found.  Installing".
     /opt/conda/bin/pip install $EXTRA_PIP_PACKAGES
 fi
-
-
-# Execute the jupyterlab as specified.
-exec start.sh $@

notebook/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+jupyter lab --NotebookApp.base_url="${NB_PREFIX:-/}" --NotebookApp.allow_origin="*" ${JUPYTERLAB_ARGS}