From 6fcb8f16c8390c84e862fd90ab2cb3b18aff8739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laurent?= <francois.laurent@posteo.net> Date: Wed, 15 Mar 2023 13:01:00 +0100 Subject: [PATCH] --no-cache option for build command --- Manifest.toml | 2 +- scripts/larvatagger.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index c64529f..37e3734 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -892,7 +892,7 @@ version = "0.3.2" [[deps.PlanarLarvae]] deps = ["DelimitedFiles", "HDF5", "JSON3", "LinearAlgebra", "MAT", "Meshes", "OrderedCollections", "SHA", "StaticArrays", "Statistics", "StatsBase", "StructTypes"] git-tree-sha1 = "5b7020f80af940ba6ce9140aeece184456bca447" -repo-rev = "dev" +repo-rev = "main" repo-url = "https://gitlab.pasteur.fr/nyx/planarlarvae.jl" uuid = "c2615984-ef14-4d40-b148-916c85b43307" version = "0.9.2" diff --git a/scripts/larvatagger.sh b/scripts/larvatagger.sh index d1198ef..54e7d0d 100755 --- a/scripts/larvatagger.sh +++ b/scripts/larvatagger.sh @@ -28,7 +28,7 @@ while ! [ -z "$1" ]; do if [ "$1" = "--dev" -o "$1" = "--stable" ]; then BUILD=$1; shift elif [ "$1" = "--get-backend" -o "$1" = "--with-default-backend" ]; then -DOCKER_ARGS="--build-arg BACKEND=MaggotUBA/20230129 $DOCKER_ARGS"; shift +DOCKER_ARGS="--build-arg BACKEND=MaggotUBA/20230311 $DOCKER_ARGS"; shift TARGET=backend elif [ "$1" = "--with-backend" ]; then DOCKER_ARGS="--build-arg BACKEND=$2 $DOCKER_ARGS"; shift 2 @@ -36,6 +36,8 @@ TARGET=backend elif [ "${1:0:15}" = "--with-backend=" ]; then DOCKER_ARGS="--build-arg BACKEND=${1:15} $DOCKER_ARGS"; shift TARGET=backend +elif [ "$1" = "--no-cache" ]; then +DOCKER_ARGS="--no-cache $DOCKER_ARGS"; shift else echo "argument not supported: $1"; shift exit 1 @@ -138,7 +140,7 @@ docker run $RUN_ARGS "$LARVATAGGER_IMAGE" train "/app/$backend" "/data/$data_rep data_file=$1; shift backend=MaggotUBA -tagger="20230129" +tagger="20230311" while [ -n "$1" ]; do if [ "${1:0:16}" = "--model-instance" ]; then if [ "$1" = "--model-instance" ]; then -- GitLab