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.

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

docker: update to JupyterLab v3 and fix broken jupyterlab-system-monitor plugin #85

Merged
merged 14 commits into from
Jul 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
// https://jenkins.io/doc/book/pipeline/syntax/
agent {
docker {
image "pavics/workflow-tests:210723"
image "pavics/workflow-tests:210728"
label 'linux && docker'
}
}
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pavics/workflow-tests:210723
FROM pavics/workflow-tests:210728

USER root

Expand Down
12 changes: 2 additions & 10 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,8 @@ RUN jupyter lab build
RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager \
&& jupyter serverextension enable voila --sys-prefix \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager jupyter-leaflet \
&& jupyter labextension install @bokeh/jupyter_bokeh \
&& jupyter labextension install @pyviz/jupyterlab_pyviz \
&& jupyter labextension install @jupyterlab/debugger \
&& jupyter labextension install @jupyterlab/google-drive \
&& jupyter labextension install jupyterlab-topbar-extension \
jupyterlab-system-monitor \
jupyterlab-topbar-text \
jupyterlab-logout \
jupyterlab-theme-toggle \
jupyterlab_conda
&& jupyter labextension install jupyterlab-topbar-text \
jupyterlab-theme-toggle
# && jupyter labextension install jupyterlab-clipboard

ADD https://raw.githubusercontent.com/jupyter/docker-stacks/master/base-notebook/start.sh /usr/local/bin/
Expand Down
22 changes: 14 additions & 8 deletions docker/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ dependencies:
- rasterio
- gdal # for osgeo
- geopandas
# Pin pandas due to xarray
# https://github.com/pydata/xarray/issues/5588#issuecomment-885271773
- pandas==1.2.5
- pandas
- rioxarray
- scikit-image
- ipyleaflet
Expand All @@ -37,6 +35,8 @@ dependencies:
- pscript
- h5netcdf
- panel
# https://github.com/holoviz/panel
- pyviz_comms # (was labextension pyviz/jupyterlab_pyviz in jupyterlab v2)
- holoviews
- geoviews
# this might still be relevant https://github.com/holoviz/hvplot/issues/498
Expand Down Expand Up @@ -91,19 +91,25 @@ dependencies:
- jupyter
# to be launched by image jupyterhub/jupyterhub
- notebook
- jupyterlab==2.2.9
- jupyterlab
- jupyterhub
# https://github.com/mamba-org/gator (was jupyter_conda)
- mamba_gator
# to diff .ipynb files
- nbdime
# extension to produce .py files from notebook .ipynb files
- jupytext
# jupyterlab extension for git
- jupyterlab-git
# jupyterlab extension for conda
- jupyter_conda
# Voila turns Jupyter notebooks into standalone web applications
- voila
- jupyter-archive
# https://github.com/jtpio/jupyterlab-topbar
- jupyterlab-topbar
# https://github.com/jtpio/jupyterlab-system-monitor (was from jupyterlab-topbar)
- jupyterlab-system-monitor
- jupyter-resource-usage # needed by jupyterlab-system-monitor
- nbresuse # needed by jupyterlab-system-monitor
# xeus-python: back-end kernel implementing the Jupyter Debug Protocol
- xeus-python
- jupyter-dash
Expand All @@ -126,8 +132,8 @@ dependencies:
# https://github.com/ShopRunner/jupyter-notify
# Jupyter Magic For Browser Notifications of Cell Completion.
- jupyternotify
# Needed for https://github.com/jtpio/jupyterlab-topbar
- nbresuse
# https://github.com/jupyterlab-contrib/jupyterlab-logout (was from jupyterlab-topbar)
- jupyterlab-logout
# Needed to run notebook tests. Missing indirect recursive dependencies
# somewhere, should not need to manually add it here.
- pytest-tornasync
2 changes: 1 addition & 1 deletion launchcontainer
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh -x

if [ -z "$DOCKER_IMAGE" ]; then
DOCKER_IMAGE="pavics/workflow-tests:210723"
DOCKER_IMAGE="pavics/workflow-tests:210728"
fi

if [ -z "$CONTAINER_NAME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion launchnotebook
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
fi

if [ -z "$DOCKER_IMAGE" ]; then
DOCKER_IMAGE="pavics/workflow-tests:210723"
DOCKER_IMAGE="pavics/workflow-tests:210728"
fi

if [ -z "$CONTAINER_NAME" ]; then
Expand Down