diff --git a/recipes/Dockerfile b/recipes/Dockerfile index 6458645ee8906595750c6c149e6f113bb2988f77..4489a17ed460154b4c004ea8f3fc2a33409d1a45 100644 --- a/recipes/Dockerfile +++ b/recipes/Dockerfile @@ -1,4 +1,4 @@ -FROM julia:1.10.4-bullseye AS base +FROM julia:1.10.6-bullseye AS base ARG PROJECT_DIR=/app ARG BRANCH=main diff --git a/recipes/README.md b/recipes/README.md index 4259994144c7f0c6582e969aedabba0550729c37..5ad9e8eba19161dc6f1bc7f2593a96e387537981 100644 --- a/recipes/README.md +++ b/recipes/README.md @@ -177,7 +177,7 @@ docker pull flaur/larvatagger ``` Beware that images that ship with a tagging backend are relatively large files (>5GB on disk). -If you are not interested in automatic tagging, use the `flaur/larvatagger:0.18-standalone` image instead. +If you are not interested in automatic tagging, use the `flaur/larvatagger:0.19-standalone` image instead. ### Upgrading diff --git a/scripts/larvatagger.sh b/scripts/larvatagger.sh index af552f9aaa6bfc8fa595e7cf25302125675b1534..3cf76b9281fb3a4978dd88f2b717148b0639bf20 100755 --- a/scripts/larvatagger.sh +++ b/scripts/larvatagger.sh @@ -137,7 +137,9 @@ else echo "Using environment variable: TAGGINGBACKENDS_BRANCH= $TAGGINGBACKENDS_BRANCH" fi DOCKER_ARGS="--build-arg TAGGINGBACKENDS_BRANCH=$TAGGINGBACKENDS_BRANCH $DOCKER_ARGS" -$docker build -t "$LARVATAGGER_IMAGE" ${DOCKER_ARGS}--build-arg BRANCH=$LARVATAGGER_BRANCH . +DOCKER_BUILD="$docker build -t "$LARVATAGGER_IMAGE" ${DOCKER_ARGS}--build-arg BRANCH=$LARVATAGGER_BRANCH ." +echo $DOCKER_BUILD +eval $DOCKER_BUILD fi ;; diff --git a/test/deploy_and_test.sh b/test/deploy_and_test.sh index 91bc7e83f30b5a079cd7bd86b1ab8104fb9c649e..942ffd26d6355a6156b610668ec3de26bc7b69eb 100755 --- a/test/deploy_and_test.sh +++ b/test/deploy_and_test.sh @@ -73,9 +73,8 @@ if [ -f LarvaTagger_test_data.tgz ]; then (cd "$LTROOT" && tar zxvf LarvaTagger_test_data.tgz) else # Not recommended; reproducibility is not guarantee across hosts or architectures yet - #wget -O- https://dl.pasteur.fr/fop/8MvgygD4/LarvaTagger_test_data.tgz | tar zxv (cd "$LTROOT" && \ - wget -O- https://dl.pasteur.fr/fop/t8CtkCpY/240208_LarvaTagger_test_data.tgz | tar zxv) + wget -O- https://dl.pasteur.fr/fop/ppk8GBQf/241127_LarvaTagger_test_data.tgz | tar zxv) fi if [ "$LOCAL_SCENARII" = "1" ]; then