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

docker: add regionmask and salem for Era5 Raven notebooks, removed jupyter_bokeh #36

Merged
merged 5 commits into from Mar 10, 2020
Merged

docker: add regionmask and salem for Era5 Raven notebooks, removed jupyter_bokeh #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0c330a
docker: pin jupyterlab==1.2.5, jupyter_bokeh do not support jupyterla…
tlvu Mar 9, 2020
0a326b6
docker: add regionmask and salem for Raven Era5 notebooks
tlvu Mar 9, 2020
bf1133d
docker: try bokeh from pip since pinning old jupyterlab do not work
tlvu Mar 9, 2020
d7be6f1
docker: remove bokeh since not compatible with latest JupyterLab 2.0.1
tlvu Mar 9, 2020
50a33d5
release: update to use image pavics/workflow-tests:200309
tlvu Mar 9, 2020
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ pipeline {
// https://jenkins.io/doc/book/pipeline/syntax/
agent {
docker {
image "pavics/workflow-tests:200120"
image "pavics/workflow-tests:200309"
label 'linux && docker'
}
}
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM pavics/workflow-tests:200120
FROM pavics/workflow-tests:200309

USER root

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Expand Up @@ -35,8 +35,8 @@ RUN jupyter lab build
# for ipywidgets to work with jupyter lab (notebooks works out of the box)
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 @jupyter-widgets/jupyterlab-manager jupyter-leaflet
# && jupyter labextension install @bokeh/jupyter_bokeh

ADD https://raw.githubusercontent.com/jupyter/docker-stacks/master/base-notebook/start.sh /usr/local/bin/
ADD https://raw.githubusercontent.com/jupyter/docker-stacks/master/base-notebook/start-singleuser.sh /usr/local/bin/
Expand Down
6 changes: 4 additions & 2 deletions docker/environment.yml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ name: birdy
channels:
- conda-forge
- cdat
- bokeh
# - bokeh
- defaults
dependencies:
- matplotlib
Expand All @@ -20,7 +20,8 @@ dependencies:
- geopandas
- ipyleaflet
- threddsclient
- bokeh
# - bokeh
- regionmask
# can re-enable xclim from conda once we have write access to
# https://github.com/conda-forge/xclim-feedstock
# - xclim
Expand Down Expand Up @@ -52,3 +53,4 @@ dependencies:
# visual debugger for Jupyter Notebook, not working with JupyterLab at this moment
- pixiedust
- requests-magpie
- salem
2 changes: 1 addition & 1 deletion launchcontainer
View file
Open in desktop
@@ -1,7 +1,7 @@
#!/bin/sh -x

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

if [ -z "$CONTAINER_NAME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion launchnotebook
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
fi

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

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