From 6bfeccb286d385a10f230b759af6b3fc559bc4e1 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 17 Sep 2020 15:57:35 +0200
Subject: [PATCH] [jupyterhub] Should now work again
---
jupyterhub/base/Dockerfile | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/jupyterhub/base/Dockerfile b/jupyterhub/base/Dockerfile
index 41b1ca9..e306547 100755
--- a/jupyterhub/base/Dockerfile
+++ b/jupyterhub/base/Dockerfile
@@ -21,6 +21,13 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
npm config set cache /var/cache/npm --global && \
npm config set update-notifier false --global
+ENV XDG_DATA_HOME=/usr/local/share
+ENV IPYTHONDIR=/usr/local/etc/ipython
+ENV JUPYTER_CONFIG_DIR=/usr/local/etc/jupyter
+COPY jupyter_notebook_config.py ${JUPYTER_CONFIG_DIR}/
+ENV JUPYTERLAB_SETTINGS_DIR=/root/.config/jupyter/lab/user-settings
+ENV JUPYTERLAB_WORKSPACES_DIR=/root/.config/jupyter/lab/workspaces
+
RUN python${PYTHON_VERSION} -m pip install \
jupyterlab \
jupyterhub \
@@ -42,13 +49,6 @@ RUN python${PYTHON_VERSION} -m pip install \
python${PYTHON_VERSION} -m pip install jupyterlab-git && \
python${PYTHON_VERSION} -m jupyter lab build
-ENV IPYTHONDIR=/usr/local/etc/ipython
-ENV JUPYTER_CONFIG_DIR=/usr/local/etc/jupyter
-COPY jupyter_notebook_config.py ${JUPYTER_CONFIG_DIR}/
-ENV JUPYTERLAB_SETTINGS_DIR=/root/.config/jupyter/lab/user-settings
-ENV JUPYTERLAB_WORKSPACES_DIR=/root/.config/jupyter/lab/workspaces
-ENV XDG_DATA_HOME=/usr/local/share
-
RUN mkdir -p /usr/local/venv && \
python${PYTHON_VERSION} -m venv /usr/local/venv/default && \
. /usr/local/venv/default/bin/activate && \
@@ -82,7 +82,6 @@ RUN mkdir -p /usr/local/venv && \
ipython kernel install --name=default
RUN chmod -x /etc/update-motd.d/*
-RUN mkdir /data
WORKDIR "/"
CMD [ "jupyterhub-singleuser" ]
--
GitLab