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

Jupyter docker: incremental build to add fstd2nc to convert RPN files (from Environment Canada) to netCDF files #132

Merged
merged 3 commits into from
Dec 6, 2023
Merged

Jupyter docker: incremental build to add fstd2nc to convert RPN files (from Environment Canada) to netCDF files #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c32c18
docker: add fstd2nc for Pascal Atelier ARRIMÉ - UQAM
tlvu Nov 22, 2023
62a2065
release: update to use image pavics/workflow-tests:py39-230601-1-upda…
tlvu Nov 22, 2023
6cc6378
Merge remote-tracking branch 'origin/master' into incremental-build-f…
tlvu Nov 30, 2023
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:py39-230601-1-update231025"
image "pavics/workflow-tests:py39-230601-1-update231122"
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:py39-230601-1-update231025
FROM pavics/workflow-tests:py39-230601-1-update231122

USER root

Expand Down
7 changes: 4 additions & 3 deletions docker/Dockerfile.testing
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For testing quickly without having to do a full rebuild.

FROM pavics/workflow-tests:py39-230601-1
FROM pavics/workflow-tests:py39-230601-1-update231025

#ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"

Expand All @@ -11,8 +11,9 @@ USER root
# Use 'update' for existing and 'install' for new package.
# Keep same channel ordering to not revert anything.
RUN umask 0000 \
&& mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyviz/label/dev -c defaults -n birdy salib \
&& mamba clean --all --yes
&& pip install --no-cache-dir fstd2nc
# && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyviz/label/dev -c defaults -n birdy salib \
# && mamba clean --all --yes
# && pip uninstall -y ravenpy \
# && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp

Expand Down
3 changes: 3 additions & 0 deletions docker/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ dependencies:
# https://pypi.org/project/hsclient/
# A python client for managing HydroShare resources, replaces hs_restclient
- hsclient
# https://pypi.org/project/fstd2nc/
# Converts RPN standard files (from Environment Canada) to netCDF files.
- fstd2nc
# visual debugger for Jupyter Notebook, not working with JupyterLab at this moment
- pixiedust
# block execution of 'run_all_cells' until user input finished
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:py39-230601-1-update231025"
DOCKER_IMAGE="pavics/workflow-tests:py39-230601-1-update231122"
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:py39-230601-1-update231025"
DOCKER_IMAGE="pavics/workflow-tests:py39-230601-1-update231122"
fi

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