diff --git a/Jenkinsfile b/Jenkinsfile index 12968b20..65679374 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-update231122" + image "pavics/workflow-tests:py39-230601-1-update240116" label 'linux && docker' } } diff --git a/binder/Dockerfile b/binder/Dockerfile index 135605fa..670e829a 100644 --- a/binder/Dockerfile +++ b/binder/Dockerfile @@ -1,4 +1,4 @@ -FROM pavics/workflow-tests:py39-230601-1-update231122 +FROM pavics/workflow-tests:py39-230601-1-update240116 USER root diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing index 88d43496..94d6d61c 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-update231025 +FROM pavics/workflow-tests:py39-230601-1-update231122 #ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk" @@ -11,7 +11,7 @@ USER root # Use 'update' for existing and 'install' for new package. # Keep same channel ordering to not revert anything. RUN umask 0000 \ - && pip install --no-cache-dir fstd2nc + && pip install --no-cache-dir https://github.com/bird-house/threddsclient/archive/refs/heads/master.zip # && 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 \ diff --git a/launchcontainer b/launchcontainer index 57138224..dfe32318 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-update231122" + DOCKER_IMAGE="pavics/workflow-tests:py39-230601-1-update240116" fi if [ -z "$CONTAINER_NAME" ]; then diff --git a/launchnotebook b/launchnotebook index 558503b3..32540176 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-update231122" + DOCKER_IMAGE="pavics/workflow-tests:py39-230601-1-update240116" fi if [ -z "$CONTAINER_NAME" ]; then