From d1ab5659dcb686ffdb0998c30e0c1be758bb71db Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 16 Mar 2021 19:23:18 +0100
Subject: [PATCH] Have Jupyter expose the storage inside our checkout, to allow
files stored there to be version managed
---
docker-compose/Makefile | 2 +-
docker-compose/jupyter.yml | 2 ++
docker-compose/jupyter/Dockerfile | 2 ++
jupyter-notebooks/test.txt | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 jupyter-notebooks/test.txt
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 0b2f8f7c2..6c2e767c8 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -81,7 +81,7 @@ else
endif
DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) TANGO_HOST=$(TANGO_HOST) \
- NETWORK_MODE=$(NETWORK_MODE) XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) TANGO_SKA_CONTAINER_MOUNT=$(TANGO_SKA_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_MOUNT=$(TANGO_LOFAR_CONTAINER_MOUNT) MYSQL_HOST=$(MYSQL_HOST) \
+ NETWORK_MODE=$(NETWORK_MODE) XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) TANGO_SKA_CONTAINER_MOUNT=$(TANGO_SKA_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_MOUNT=$(TANGO_LOFAR_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR} MYSQL_HOST=$(MYSQL_HOST) \
CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 1a690384f..bd517ab13 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -16,6 +16,8 @@ services:
jupyter:
build:
context: jupyter
+ args:
+ JUPYTER_WORKDIR: ${TANGO_LOFAR_CONTAINER_DIR}/jupyter-notebooks
container_name: ${CONTAINER_NAME_PREFIX}jupyter
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index 96fbec498..a7324d491 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -23,4 +23,6 @@ RUN sudo chmod +x /usr/bin/tini
ENTRYPOINT ["/usr/bin/tini", "--"]
# Start jupyter notebooks on startup of container
+ARG JUPYTER_WORKDIR=/app # working directory is what Jupyter will expose as storage for its notebooks
+WORKDIR ${JUPYTER_WORKDIR}
CMD ["jupyter", "notebook", "--port=8888", "--no-browser", "--ip=0.0.0.0", "--allow-root", "--NotebookApp.token=", "--NotebookApp.password="]
diff --git a/jupyter-notebooks/test.txt b/jupyter-notebooks/test.txt
new file mode 100644
index 000000000..30d74d258
--- /dev/null
+++ b/jupyter-notebooks/test.txt
@@ -0,0 +1 @@
+test
\ No newline at end of file
--
GitLab