diff --git a/Jenkinsfile b/Jenkinsfile index 490b8ace..12968b20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' } } diff --git a/binder/Dockerfile b/binder/Dockerfile index f61ddd1f..135605fa 100644 --- a/binder/Dockerfile +++ b/binder/Dockerfile @@ -1,4 +1,4 @@ -FROM pavics/workflow-tests:py39-230601-1-update231025 +FROM pavics/workflow-tests:py39-230601-1-update231122 USER root diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing index f4be66ee..88d43496 100644 --- a/docker/Dockerfile.testing +++ b/docker/Dockerfile.testing @@ -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" @@ -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 diff --git a/docker/environment.yml b/docker/environment.yml index 8b6ab4cd..b79727bc 100644 --- a/docker/environment.yml +++ b/docker/environment.yml @@ -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 diff --git a/launchcontainer b/launchcontainer index 33cf3c01..57138224 100755 --- a/launchcontainer +++ b/launchcontainer @@ -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 diff --git a/launchnotebook b/launchnotebook index 3c4758dd..558503b3 100755 --- a/launchnotebook +++ b/launchnotebook @@ -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