summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab/test.yml2
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock2
-rw-r--r--config/.bashrc2
-rw-r--r--config/install.sh11
-rw-r--r--lib/license/finder/ext.rb1
-rw-r--r--lib/license/finder/ext/dotnet.rb11
-rw-r--r--lib/license/finder/ext/nuget.rb2
-rw-r--r--lib/license/management/version.rb2
9 files changed, 24 insertions, 13 deletions
diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 8d664c0..506f344 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -7,7 +7,7 @@ size:
timeout: 3 minutes
variables:
GIT_STRATEGY: none
- MAX_SIZE: 2147483648
+ MAX_SIZE: 1567663064
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $TMP_IMAGE
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 322b38b..222529f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# 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)
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/config/.bashrc b/config/.bashrc
index a3cde0d..3e45713 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -56,9 +56,7 @@ function enable_dev_mode() {
inflate /opt/asdf.tar.zst /opt
inflate /usr/lib/gcc.tar.zst /usr/lib
-inflate /usr/lib/mono.tar.zst /usr/lib
inflate /usr/lib/rustlib.tar.zst /usr/lib
-inflate /usr/share/dotnet.tar.zst /usr/share
# shellcheck source=/dev/null
. "$ASDF_DATA_DIR/asdf.sh"
diff --git a/config/install.sh b/config/install.sh
index 2868c94..a93451b 100644
--- a/config/install.sh
+++ b/config/install.sh
@@ -81,8 +81,6 @@ wget -q -O /etc/apt/sources.list.d/microsoft-prod.list https://packages.microsof
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list
-apt-get update -q
-apt-get install -y --no-install-recommends dotnet-sdk-3.1 mono-complete &
curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe &
echo -e "section_end:$(date +%s):install_dotnet\r\e[0K"
@@ -112,6 +110,9 @@ wait
echo -e "section_end:$(date +%s):install_asdf\r\e[0K"
echo -e "section_start:$(date +%s):cleanup\r\e[0K==> Beginning cleanup…"
+apt purge -y libx11-6 libwayland-client0
+apt autoremove -y
+
rm -fr /tmp
mkdir -p /tmp
chmod 777 /tmp
@@ -179,14 +180,8 @@ cd /usr/lib
tar --use-compress-program "$zstd_command" -cf /usr/lib/gcc.tar.zst gcc &
cd /usr/lib
-tar --use-compress-program "$zstd_command" -cf /usr/lib/mono.tar.zst mono &
-
-cd /usr/lib
tar --use-compress-program "$zstd_command" -cf /usr/lib/rustlib.tar.zst rustlib &
-cd /usr/share
-tar --use-compress-program "$zstd_command" -cf /usr/share/dotnet.tar.zst dotnet &
-
wait
rm -fr \
/opt/asdf/ \
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
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