Merge branch '13748-cli-options' into 'master'v1.8.0

Add LICENSE_FINDER_CLI_OPTS variable

See merge request gitlab-org/security-products/license-management!77

4 files changed, 33 insertions, 10 deletions

diff --git a/bin/docker-build b/bin/docker-build
new file mode 100755
index 0000000..428dda8
--- /dev/null
+++ b/bin/docker-build
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
+
+docker build . -t "$IMAGE_NAME" --pull
diff --git a/bin/docker-shell b/bin/docker-shell
new file mode 100755
index 0000000..b50e796
--- /dev/null
+++ b/bin/docker-shell
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
+
+docker run --rm -it --entrypoint='' $1 "$IMAGE_NAME" /bin/bash
diff --git a/bin/test b/bin/test
index 04dd7fe..8c08e55 100755
--- a/bin/test
+++ b/bin/test
@@ -2,14 +2,17 @@
 
 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}
-export RESULTS_DIR=${RESULTS_DIR:-`pwd`/results}
+export RESULTS_DIR=${RESULTS_DIR:-$(pwd)/results}
+export QA_REF=${QA_REF:-master}
 
 docker run \
   --rm \
   --env LM_PYTHON_VERSION \
   --env LM_REPORT_VERSION \
-  --volume $RESULTS_DIR:/results \
-  $TMP_IMAGE test $QA_PROJECT ${QA_RESULTS} $QA_REF
+  --volume "$RESULTS_DIR":/results \
+  "$IMAGE_NAME" test "$QA_PROJECT" "$QA_RESULTS" "$QA_REF"
diff --git a/bin/test_all b/bin/test-all
index ca47027..16d30e9 100755
--- a/bin/test_all
+++ b/bin/test-all
@@ -4,21 +4,23 @@ 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[@]}"
 do
   export LM_REPORT_VERSION=$version
   echo "Report Version $LM_REPORT_VERSION"
-  QA_PROJECT=go-modules QA_REF=master ./bin/test
+  QA_PROJECT=go-modules ./bin/test
   QA_PROJECT=java-maven QA_REF=831c7a04 ./bin/test
   QA_PROJECT=python-pip QA_REF=04dce91b LM_PYTHON_VERSION=2 ./bin/test
   QA_PROJECT=python-pip QA_RESULTS="python3-pip-v$version" QA_REF=48e250a1 LM_PYTHON_VERSION=3 ./bin/test
-  QA_PROJECT=ruby-bundler QA_REF=master ./bin/test
-  QA_PROJECT=js-yarn QA_REF=master ./bin/test
-  QA_PROJECT=csharp-nuget-dotnetcore QA_REF=master ./bin/test
+  QA_PROJECT=ruby-bundler ./bin/test
+  QA_PROJECT=js-yarn ./bin/test
+  QA_PROJECT=csharp-nuget-dotnetcore ./bin/test
 done