From 9e34ff1fefd0e440e15913eff8f3d0a8259f7801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laurent?= <francois.laurent@posteo.net>
Date: Wed, 27 Nov 2024 14:36:07 +0100
Subject: [PATCH] fix: test data updated
---
recipes/Dockerfile | 2 +-
recipes/README.md | 2 +-
scripts/larvatagger.sh | 4 +++-
test/deploy_and_test.sh | 3 +--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/recipes/Dockerfile b/recipes/Dockerfile
index 6458645..4489a17 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 4259994..5ad9e8e 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 af552f9..3cf76b9 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 91bc7e8..942ffd2 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
--
GitLab