summaryrefslogtreecommitdiff
path: root/bin/docker-test
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-05-15 09:29:48 +0000
committerCan Eldem <celdem@gitlab.com>2020-05-15 09:29:48 +0000
commitf91ef2e9f1ac7c2a1fc2e71423b0f09ba89a63cd (patch)
treed23111e4a7390583f4e4de17fbe916a85f56da05 /bin/docker-test
parente97cd3ea94883f487317bd1f8e6289448b9d7fe1 (diff)
parent972f990b336ed2f3feaa2f043dec4f919f17f34c (diff)
Merge branch 'dev-docs' into 'master'
Update README instructions to run tests in docker container See merge request gitlab-org/security-products/license-management!149
Diffstat (limited to 'bin/docker-test')
-rwxr-xr-xbin/docker-test18
1 files changed, 2 insertions, 16 deletions
diff --git a/bin/docker-test b/bin/docker-test
index 6fac5d7..c5b0ba1 100755
--- a/bin/docker-test
+++ b/bin/docker-test
@@ -6,19 +6,5 @@ cd "$(dirname "$0")/.."
export CI_PROJECT_DIR="$1"
-if [ -n "${LM_HOME:-}" ]; then
- mkdir -p pkg/ && gem build --silent -o pkg/license-management-test.gem ./*.gemspec
- ./run.sh analyze "$CI_PROJECT_DIR"
-else
- export IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest}
-
- docker run --rm \
- --env GRADLE_CLI_OPTS \
- --env LICENSE_FINDER_CLI_OPTS \
- --env LM_JAVA_VERSION \
- --env LM_PYTHON_VERSION \
- --env LM_REPORT_VERSION \
- --env MAVEN_CLI_OPTS \
- --volume "$CI_PROJECT_DIR":/code \
- "$IMAGE_NAME" analyze /code
-fi
+mkdir -p pkg/ && gem build --silent -o pkg/license-management-test.gem ./*.gemspec
+./run.sh analyze "$CI_PROJECT_DIR"