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: new jupyter for ravenpy and other new additions #89

Merged
merged 8 commits into from
Sep 10, 2021
Merged

docker: new jupyter for ravenpy and other new additions #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f6632b
docker: add utils for file transfert out of Jupyter env to save result
tlvu Sep 2, 2021
4edb27f
docker: allow png export from a bokeh plot (html export already works)
tlvu Sep 2, 2021
d8bc549
docker: add s3fs for Raven notebooks
tlvu Sep 2, 2021
7de1e17
docker: add clisops for Raven notebooks
tlvu Sep 3, 2021
b37b800
docker: temporary pin xclim and climpred for ravenpy
tlvu Sep 3, 2021
b26781c
docker: full install firefox-esr, remove firefox installed by conda f…
tlvu Sep 9, 2021
7af8c23
docker: fix firefox unable to start, missing libXt.so.6
tlvu Sep 9, 2021
1a7d080
release: update to use image pavics/workflow-tests:210908
tlvu Sep 9, 2021
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
View file
Open in desktop
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:210728"
image "pavics/workflow-tests:210908"
label 'linux && docker'
}
}
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pavics/workflow-tests:210728
FROM pavics/workflow-tests:210908

USER root

Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ RUN conda update conda

# to checkout other notebooks and to run pip install
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y git mercurial gcc unzip patch fonts-humor-sans && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
git mercurial gcc unzip patch fonts-humor-sans \
firefox-esr x11-utils && \
apt-get clean

COPY environment.yml /environment.yml
Expand Down
13 changes: 12 additions & 1 deletion docker/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,14 @@ dependencies:
- intake-thredds
- gcsfs
- zarr
- xclim
# https://github.com/dask/s3fs/
- s3fs
# Pinning xclim and climpred for ravenpy. Remove on next rebuild.
- xclim >=0.26.1,<0.29.0
- climpred >=2.1.0,<2.1.6
- ravenpy
# https://github.com/roocs/clisops
- clisops
# Universal Regridder for Geospatial Data
# https://github.com/pangeo-data/xESMF
- xesmf
Expand Down Expand Up @@ -116,6 +122,11 @@ dependencies:
# utilities
- curl
- wget
- nested_dict
- paramiko
- scp
- selenium
- geckodriver
# for pip packages
- pip
- pip:
Expand Down
2 changes: 1 addition & 1 deletion launchcontainer
View file
Open in desktop
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:210728"
DOCKER_IMAGE="pavics/workflow-tests:210908"
fi

if [ -z "$CONTAINER_NAME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion launchnotebook
View file
Open in desktop
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:210728"
DOCKER_IMAGE="pavics/workflow-tests:210908"
fi

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