docker testing on Windows

README.md

@@ -8,7 +8,7 @@ To natively run `LarvaTagger.jl`, you will need [`julia>=1.6`](https://julialang
 
 If you are not familiar with installing Julia, you may appreciate installation helpers such as [JILL.py](https://github.com/johnnychen94/jill.py).
 
-Alternatively, if you have Docker installed, take a look at the [dedicated instructions page](https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/tree/docker/recipes).
+Alternatively, if you have Docker installed, take a look at the [dedicated instructions page](https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/tree/main/recipes).
 
 ## Install
 

recipes/Dockerfile

@@ -9,8 +9,8 @@ RUN apt-get update && apt-get install -y \
  && julia --project=$DIRNAME -e 'using Pkg; Pkg.instantiate()' \
  && ln -s /$DIRNAME/scripts/larvatagger.jl /bin
 
-# COPY requires at least one file defined, hence `test/precompile.jl`
-COPY test/precompile.jl test/data_sample* $DIRNAME/test/
+# COPY requires at least one file defined, hence `test/precompile.sh`
+COPY test/precompile.sh test/data_sample* $DIRNAME/test/
 
 ARG TIMEZONE=UTC
 RUN ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime \

recipes/README.md

@@ -2,7 +2,7 @@
 
 ## Getting available images
 
-Images are published on [Docker Hub](https://hub.docker.com/repository/docker/flaur/larvatagger).
+Images are published on [Docker Hub](https://hub.docker.com/r/flaur/larvatagger/tags).
 
 They ship with `LarvaTagger.jl` and, optionally, with a MaggotUBA-based toy backend for automatic tagging.
 
@@ -11,17 +11,19 @@ Try:
 docker pull flaur/larvatagger:0.5-20220418
 ```
 
-Beware that images that ship with backends are relatively large files (>6GB).
+Beware that images that ship with backends are relatively large files (>6GB on disk).
 
 ## Running an image
 
 A number of options must be passed to the `docker` command for the container to open a data file:
 
 ```
-docker -iv $(pwd):/data -p 9284:9284 larvatagger open /data/path/to/your/file
+docker -iv $(pwd):/data -p 9284:9284 larvatagger open /data/path/to/your/file --browser
 ```
 with `path/to/your/file` a relative path to your file.
 
+In PowerShell on Windows, use `${PWD}` instead of `$(pwd)`.
+
 In the command above, `/data` represents the local directory, made available within the container.
 This is required, since no files outside the container can be accessed.
 

scripts/larvatagger.sh

@@ -33,12 +33,15 @@ fi
 done
 DOCKER_ARGS="--build-arg TIMEZONE=$(cat /etc/timezone) $DOCKER_ARGS"
 if [ "$BUILD" == "--dev" ]; then
-docker build -t "${LARVATAGGER_IMAGE}:dev" -f recipes/Dockerfile.local ${DOCKER_ARGS}.
+if ! [[ "$LARVATAGGER_IMAGE" == *:* ]]; then LARVATAGGER_IMAGE="${LARVATAGGER_IMAGE}:dev"; fi
+docker build -t "$LARVATAGGER_IMAGE" -f recipes/Dockerfile.local ${DOCKER_ARGS}.
 elif [ "$BUILD" == "--stable" ]; then
-docker build -t "${LARVATAGGER_IMAGE}:stable" -f recipes/Dockerfile ${DOCKER_ARGS}.
+if ! [[ "$LARVATAGGER_IMAGE" == *:* ]]; then LARVATAGGER_IMAGE="${LARVATAGGER_IMAGE}:stable"; fi
+docker build -t "$LARVATAGGER_IMAGE" -f recipes/Dockerfile ${DOCKER_ARGS}.
 else
+if ! [[ "$LARVATAGGER_IMAGE" == *:* ]]; then LARVATAGGER_IMAGE="${LARVATAGGER_IMAGE}:latest"; fi
 if [ -z "$LARVATAGGER_DEFAULT_BRANCH" ]; then LARVATAGGER_DEFAULT_BRANCH=dev; fi
-docker build -t "${LARVATAGGER_IMAGE}:latest" -f recipes/Dockerfile ${DOCKER_ARGS}--build-arg BRANCH=$LARVATAGGER_DEFAULT_BRANCH .
+docker build -t "$LARVATAGGER_IMAGE" -f recipes/Dockerfile ${DOCKER_ARGS}--build-arg BRANCH=$LARVATAGGER_DEFAULT_BRANCH .
 fi
 #rm -rf ./external
 ;;

test/precompile.sh

@@ -25,7 +25,8 @@ using Pkg
 Pkg.add([\"$client\",\"PackageCompiler\"])
 using PackageCompiler
 println(\"🢃 🢃 🢃 Includes logs from coverage script. Please ignore 🢃 🢃 🢃\")
-create_sysimage(String[], sysimage_path=\"larvatagger.so\", precompile_execution_file=\"$script\")
+create_sysimage(String[], sysimage_path=\"larvatagger.so\", precompile_execution_file=\"$script\",
+                cpu_target=PackageCompiler.default_app_cpu_target())
 println(\"🢁 🢁 🢁 Includes logs from coverage script. Please ignore 🢁 🢁 🢁\")
 #Pkg.rm([\"PackageCompiler\",\"$client\"])"