Delegate to docker-build script

2 files changed, 8 insertions, 4 deletions

diff --git a/bin/test b/bin/test
index b7113e3..290b23b 100755
--- a/bin/test
+++ b/bin/test
@@ -2,6 +2,8 @@
 
 set -e
 
+cd "$(dirname "$0")/.."
+
 export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-2}
 export LM_REPORT_VERSION=${LM_REPORT_VERSION:-1}
 export QA_RESULTS=${QA_RESULTS:-$QA_PROJECT-v$LM_REPORT_VERSION}
@@ -13,4 +15,4 @@ docker run \
   --env LM_PYTHON_VERSION \
   --env LM_REPORT_VERSION \
   --volume "$RESULTS_DIR":/results \
-  "$TMP_IMAGE" test "$QA_PROJECT" "${QA_RESULTS}" "$QA_REF"
+  "$IMAGE_NAME" test "$QA_PROJECT" "${QA_RESULTS}" "$QA_REF"
diff --git a/bin/test_all b/bin/test_all
index 7f6e373..16d30e9 100755
--- a/bin/test_all
+++ b/bin/test_all
@@ -4,10 +4,12 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-export RESULTS_DIR=$(pwd)/tmp
-export TMP_IMAGE=$(basename $PWD):latest
+RESULTS_DIR=$(pwd)/tmp
+export RESULTS_DIR
+IMAGE_NAME=$(basename "$PWD"):latest
+export IMAGE_NAME
 
-docker build . -t "$TMP_IMAGE" --pull
+./bin/docker-build
 
 REPORT_VERSIONS=(1 1.1 2)
 for version in "${REPORT_VERSIONS[@]}"