From 5500e3d86d41eca515bfc7b481dc59702553b59f Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 7 Jul 2020 17:50:12 -0600 Subject: Remove GUI packages, install dotnet at scan time --- lib/license/finder/ext.rb | 1 + lib/license/finder/ext/dotnet.rb | 11 +++++++++++ lib/license/finder/ext/nuget.rb | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 lib/license/finder/ext/dotnet.rb (limited to 'lib') diff --git a/lib/license/finder/ext.rb b/lib/license/finder/ext.rb index da6a006..1154a4a 100644 --- a/lib/license/finder/ext.rb +++ b/lib/license/finder/ext.rb @@ -4,6 +4,7 @@ require 'license/finder/ext/bower' require 'license/finder/ext/bundler' require 'license/finder/ext/conan' require 'license/finder/ext/dependency' +require 'license/finder/ext/dotnet' require 'license/finder/ext/go_modules' require 'license/finder/ext/gradle' require 'license/finder/ext/license' diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb new file mode 100644 index 0000000..1b98881 --- /dev/null +++ b/lib/license/finder/ext/dotnet.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module LicenseFinder + class Dotnet + def prepare + shell.execute(['apt-get', :update, '-q']) + shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'dotnet-sdk-3.1']) + shell.execute([:dotnet, :restore]) + end + end +end diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb index fc06e21..1aa3b1b 100644 --- a/lib/license/finder/ext/nuget.rb +++ b/lib/license/finder/ext/nuget.rb @@ -3,6 +3,8 @@ module LicenseFinder class Nuget def prepare_command + shell.execute(['apt-get', :update, '-q']) + shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'mono-complete']) "mono /usr/local/bin/nuget.exe restore -Verbosity detailed" end -- cgit v1.2.3 From 1696dc714370772b50497b192097cc277e9d4c6b Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 9 Jul 2020 10:50:48 -0600 Subject: Bump version --- CHANGELOG.md | 5 ++++- Gemfile.lock | 2 +- lib/license/management/version.rb | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a5ee27..222529f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ # GitLab License management changelog +## v3.16.0 + +- Install `dotnet` and `mono` at scan time to decrease size of Docker image. (!185) + ## v3.15.0 - Detect `gems.rb` and `gems.locked` in `Bundler` projects. (!186) -- Install `dotnet` and `mono` at scan time to decrease size of Docker image. (!185) ## v3.14.0 diff --git a/Gemfile.lock b/Gemfile.lock index cc7f42d..1180cf2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - license-management (3.15.0) + license-management (3.16.0) license_finder (~> 6.6.0) GEM diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 50e69a0..214f7b5 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.15.0' + VERSION = '3.16.0' end end -- cgit v1.2.3