Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate with jupyterhub launcher #189

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Integrate with jupyterhub launcher #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
908997d
Make the notebook container compatible with being used from the Jupyt…
holdenk Aug 3, 2021
4c9d510
Use command or args
holdenk Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:

notebook:
image: daskdev/dask-notebook:latest
command: ["start.sh", "jupyter", "lab"]
ports:
- "8888:8888"
environment:
Expand Down
1 change: 1 addition & 0 deletions notebook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN mamba install --yes python=${PYTHON_VERSION} nomkl \
cachey \
streamz \
dask-labextension>=5 \
&& pip install dask-kubernetes \
&& mamba clean -tipsy \
&& jupyter lab clean \
&& jlpm cache clean \
Expand Down
4 changes: 2 additions & 2 deletions notebook/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ if [ "$EXTRA_PIP_PACKAGES" ]; then
fi


# Execute the jupyterlab as specified.
exec start.sh jupyter lab ${JUPYTERLAB_ARGS}
# Execute the jupyterlab as specified from either JUPYTERLAB_ARGS or command line args.
exec ${JUPYTERLAB_ARGS} "$@"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be

Suggested change
exec ${JUPYTERLAB_ARGS} "$@"
exec "$@ ${JUPYTERLAB_ARGS}"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also wonder if we should rename it to EXTRA_JUPYTERLAB_ARGS to make it clear what it is. This isn't really and either or situation, the command should always be passed via the $@.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra works too :)