summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-12-11 16:08:29 -0700
committermo khan <mo.khan@gmail.com>2019-12-11 16:08:29 -0700
commit706350657d9223f9f88e57c0fe2f5f9adaf3ddda (patch)
tree879ed23452c9f4f5c56585f27fb6b9fb99540645
parent1eb9acf341c51217241504ad39f0a98b8ead98a1 (diff)
Remove the default license finder that ships with the docker image
-rw-r--r--Dockerfile2
-rw-r--r--license-management.gemspec2
-rwxr-xr-xrun.sh1
3 files changed, 3 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 0f7f531..ba2d073 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,5 +42,5 @@ ENV LM_REPORT_VERSION ${LM_REPORT_VERSION:-1}
COPY test /test
COPY run.sh /
COPY . /opt/license-management/
-RUN bash -lc "cd /opt/license-management && gem build *.gemspec && gem install *.gem"
+RUN bash -lc "gem uninstall --executables -a --force license_finder && cd /opt/license-management && gem build *.gemspec && gem install --no-document *.gem"
ENTRYPOINT ["/run.sh"]
diff --git a/license-management.gemspec b/license-management.gemspec
index 8213fa5..deee3fc 100644
--- a/license-management.gemspec
+++ b/license-management.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']
- spec.add_dependency 'license_finder', '~> 5.9'
+ spec.add_dependency 'license_finder', '~> 5.9.2'
spec.add_development_dependency 'rspec', '~> 3.9'
end
diff --git a/run.sh b/run.sh
index b3048b8..40f76de 100755
--- a/run.sh
+++ b/run.sh
@@ -182,6 +182,7 @@ case "$COMMAND" in
prepare="--prepare"
fi
echo "Preparing JSON report..."
+ license_management version
license_management report ${prepare} --format=json --save=gl-license-management-report.json ${LICENSE_FINDER_CLI_OPTS}
popd > /dev/null
;;