From 9eb2b48ee42a340fb231a240b3f451eb5ff8f810 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 4 Mar 2020 12:50:07 -0700
Subject: Remove TOOLS_IMAGE

---
 bin/docker-build | 5 +----
 bin/docker-test  | 7 ++++++-
 bin/test         | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/docker-build b/bin/docker-build
index 8b07e0e..39a9160 100755
--- a/bin/docker-build
+++ b/bin/docker-build
@@ -6,10 +6,7 @@ cd "$(dirname "$0")/.."
 
 if command -v docker; then
   IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
-  TOOLS_IMAGE=${TOOLS_IMAGE:-$(basename "$PWD")/tools:master}
-
-  docker build -t "$TOOLS_IMAGE" -f Dockerfile.tools --pull .
-  docker build --build-arg TOOLS_IMAGE="$TOOLS_IMAGE" -t "$IMAGE_NAME" .
+  docker build -t "$IMAGE_NAME" .
 else
   echo "Install docker: https://docs.docker.com/engine/installation/"
   exit 1
diff --git a/bin/docker-test b/bin/docker-test
index 75bfc39..b1965a3 100755
--- a/bin/docker-test
+++ b/bin/docker-test
@@ -9,7 +9,12 @@ PROJECT_PATH="$1"
 if [ -z "$LM_HOME" ]; then
   export IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
 
-  docker run --rm --env LICENSE_FINDER_CLI_OPTS --volume "$PROJECT_PATH":/code "$IMAGE_NAME" analyze /code
+  docker run --rm \
+    --env LICENSE_FINDER_CLI_OPTS \
+    --env LM_PYTHON_VERSION \
+    --env LM_REPORT_VERSION \
+    --volume "$PROJECT_PATH":/code \
+    "$IMAGE_NAME" analyze /code
 else
   /run.sh analyze "$PROJECT_PATH"
 fi
diff --git a/bin/test b/bin/test
index 70f8581..b94afd3 100755
--- a/bin/test
+++ b/bin/test
@@ -4,4 +4,4 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-bundle exec rspec
+bundle exec rspec "$@"
-- 
cgit v1.2.3