fix: issues with env var and scripts

Dockerfile

@@ -92,5 +92,5 @@ ENV PYTHONPATH=$APP_CODE:$PYTHONPATH
 # Expose streamlit application
 EXPOSE 8501 
 EXPOSE 7860
-ENTRYPOINT [bash]
-CMD [start_server.sh]
+ENTRYPOINT [ "bash", "-o", "allexport" ]
+CMD [ "start_server.sh" ]

scripts/build-local-docker.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+source $(dirname $0)/common_header.sh
+
+# Export the dependencies managed by Poetry in the requirements.txt format for pip
+poetry export -f requirements.txt -o requirements.txt --without-hashes --with=jupyter
+
+# Re-build the docker image.
+docker build -f $ROOT_DIRECTORY/Dockerfile --label tests -t $CONTAINER_NAME .
+
+
+

scripts/common_header.sh

@@ -0,0 +1,7 @@
+CONTAINER_NAME=persistent-docker-space
+VOLUME_NAME=ai-playground-vol
+
+set -e  # Exits on first error
+
+SCRIPT_PATH="$(realpath "${BASH_SOURCE:-$0}")"
+ROOT_DIRECTORY="$(dirname "$(dirname "${SCRIPT_PATH}")")"

scripts/{build-run-local-docker.sh → run-local-docker.sh}

@@ -1,30 +1,15 @@
-#!/usr/bin/env sh
-CONTAINER_NAME=persistent-docker-space
-VOLUME_NAME=ai-playground-vol
-
-set -e  # Exits on first error
-
-SCRIPT_PATH="$(realpath "${BASH_SOURCE:-$0}")"
-ROOT_DIRECTORY="$(dirname "$(dirname "${SCRIPT_PATH}")")"
-pushd $ROOT_DIRECTORY
-echo "Running from ROOT_DIRECTORY: ${ROOT_DIRECTORY}"
-
-# Export the dependencies managed by Poetry in the requirements.txt format for pip
-poetry export -f requirements.txt -o requirements.txt --without-hashes --with=jupyter
-
-# Re-build the docker image.
-docker build --label tests -t $CONTAINER_NAME .
+#!/usr/bin/env bash
+source $(dirname $0)/common_header.sh
 
 # During development ONLY use a `bind mount` to enable
 # editing the code without having to rebuild the container.
 docker run --rm -it                                           \
     -p 8501:8501 -p 7860:7860                                 \
-    --env .env                                                \
+    --env-file ${ROOT_DIRECTORY}/.env                         \
     --mount type=volume,src=$VOLUME_NAME,dst=/data            \
     --mount type=bind,source=${ROOT_DIRECTORY}/src/,target=/app/,readonly                        \
     --mount type=bind,source=${ROOT_DIRECTORY}/.streamlit,target=/user/.streamlit,readonly       \
     $CONTAINER_NAME:latest                                    \
     $@ # Pass all command line argument quoted in a good way
 
-popd > /dev/null
 

start_jupyter.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+if [ -z ${JUPYTER_TOKEN+x} ]; then echo "Please export JUPYTER_TOKEN from your '.env' file"; exit -2 ; fi 
+
 jupyter lab \
     --ip "0.0.0.0" \
     --port 7860 \

start_server.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source start_jupyter.sh
+source ./start_jupyter.sh