Merge pull request #53 from ResearchLuxembourg/mk-updates

small updates
ResearchLuxembourg · Oct 19, 2022 · f287d4e · f287d4e
2 parents 770e65a + 6cff989
commit f287d4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM julia
+FROM julia:1.8.0-bullseye
 
 ADD Project.toml /tool/
 ADD components /tool/components

diff --git a/run_pipeline.sh b/run_pipeline.sh
@@ -22,11 +22,16 @@ DOCKER="docker run --rm $MOUNT $IMAGE julia --project "
 mkdir -p output logs
 export RESTIMATOR_OUTDIR=output
 
-if $DOCKER components/check_input.jl "$FILE"
+$DOCKER components/check_input.jl "$FILE" 2>&1 | log check
+if [ ${PIPESTATUS[0]} -eq 0 ]
 then
+	st=0
 	$DOCKER components/estimate_r_t.jl "$FILE" 2>&1 | log rt
+	[ ${PIPESTATUS[0]} -eq 0 ] || st=1
 	$DOCKER components/estimate_r_eff.jl "$FILE" 2>&1 | log reff
+	[ ${PIPESTATUS[0]} -eq 0 ] || st=1
+	exit $st
 else
 	echo $0: check failed >&2
 	exit 1
-fi 2>&1 | log check
+fi