Install mono/nuget at build time

* Install ca-certificates-mono
* Download *.deb files to /opt/toolcache/mono

7 files changed, 36 insertions, 19 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a310c65..38d1587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v3.19.0
 
 - Include the latest LTS of the .NET SDK in the Docker image. (!191)
+- Include the latest LTS of Mono in the Docker image. (!193)
 
 ## v3.18.1
 
diff --git a/Dockerfile b/Dockerfile
index a5119c3..50ee6b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,21 @@
 # syntax = docker/dockerfile:experimental
-FROM debian:stable AS deb-builder
+FROM debian:stable AS gem-builder
 WORKDIR /build
 COPY . ./
-RUN ./bin/omnibus setup
-RUN ./bin/omnibus build license_management
+RUN ./bin/omnibus setup && \
+  ./bin/omnibus build license_management && \
+  mkdir -p /opt/toolcache && \
+  cp pkg/*.deb /opt/toolcache/
+
+FROM debian:stable AS mono-builder
+RUN apt-get update -q
+RUN apt-get install --no-install-recommends -y apt-transport-https dirmngr gnupg ca-certificates
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+RUN echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list
+RUN apt-get update -q
+RUN mv /etc/apt/apt.conf.d/docker-clean /etc/apt/apt.conf.d/docker-clean.bak
+RUN apt-get install -y --no-install-recommends nuget referenceassemblies-pcl ca-certificates-mono
+RUN mkdir -p /opt/toolcache && cp /var/cache/apt/archives/*.deb /opt/toolcache/
 
 FROM debian:stable-slim
 ENV ASDF_DATA_DIR="/opt/asdf"
@@ -12,7 +24,8 @@ ENV TERM="xterm"
 WORKDIR /opt/gitlab
 COPY config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 RUN mkdir -p /opt/toolcache
-COPY --from=deb-builder /build/pkg/*.deb /opt/toolcache/
+COPY --from=gem-builder /opt/toolcache/*.deb /opt/toolcache/
+COPY --from=mono-builder /opt/toolcache/*.deb /opt/toolcache/mono/
 COPY config/install.sh /opt/install.sh
 RUN bash /opt/install.sh
 COPY run.sh /
diff --git a/config/install.sh b/config/install.sh
index 834dff8..8d555c4 100644
--- a/config/install.sh
+++ b/config/install.sh
@@ -76,7 +76,7 @@ apt-get install -y --no-install-recommends \
 echo -e "section_end:$(date +%s):install_packages\r\e[0K"
 
 echo -e "section_start:$(date +%s):install_asdf\r\e[0K==> Installing asdf…"
-dpkg --install "$(find /opt/toolcache/ -name "license-management*.deb")"
+dpkg --install /opt/toolcache/license*.deb
 rm -fr /root
 ln -s /opt/gitlab /root
 
diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb
index e9e0490..d2cb998 100644
--- a/lib/license/finder/ext/dotnet.rb
+++ b/lib/license/finder/ext/dotnet.rb
@@ -18,10 +18,10 @@ module LicenseFinder
       shell.execute([
         '/opt/asdf/installs/dotnet/latest/dotnet',
         :restore, detected_package_path.to_s,
+        '--locked-mode',
         '--no-cache',
         '--packages', vendor_path.to_s,
-        '--locked-mode',
-        '--verbosity', :detailed
+        '--verbosity', :normal
       ])
     end
 
diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb
index 6fb2553..93985ba 100644
--- a/lib/license/finder/ext/nuget.rb
+++ b/lib/license/finder/ext/nuget.rb
@@ -3,22 +3,24 @@
 module LicenseFinder
   class Nuget
     def prepare
-      shell.execute(['apt-get', :update, '-q'])
-      shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'mono-complete'])
+      shell.execute(['apt-get', :install, '-y', '/opt/toolcache/mono/*.deb'])
       shell.execute([:mkdir, '-p', vendor_path.to_s]) unless vendor_path.exist?
-
       Dir.chdir(project_path) do
         shell.execute([
           :mono, '/usr/local/bin/nuget.exe',
           :restore, detected_package_path,
-          '-Verbosity detailed',
-          '-PackagesDirectory', vendor_path,
+          '-LockedMode',
           '-NoCache',
-          '-LockedMode'
+          '-PackagesDirectory', vendor_path,
+          '-Verbosity', :normal
         ])
       end
     end
 
+    def installed?(*args)
+      File.exist?('/usr/local/bin/nuget.exe')
+    end
+
     def current_packages
       dependencies.map do |dependency|
         nupkg = vendor_path.glob("**/#{dependency.name}*.nupkg")[0]
@@ -45,6 +47,8 @@ module LicenseFinder
       []
     end
 
+    private
+
     def vendor_path
       @vendor_path ||= Pathname.pwd.join('.gitlab', 'cache', 'vendor')
     end
diff --git a/lib/license/management.rb b/lib/license/management.rb
index 58310f7..0824157 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -26,7 +26,8 @@ module License
     def self.logger
       @logger ||= Logger.new(STDOUT, level: ENV.fetch('LOG_LEVEL', Logger::WARN)).tap do |x|
         x.formatter = proc do |_severity, _datetime, _progname, message|
-          "[v#{VERSION}] #{message}\n"
+          prefix = message.start_with?("\n") ? "" : "[v#{VERSION}] "
+          "#{prefix}#{message}\n"
         end
       end
     end
diff --git a/spec/support/proxy_helper.rb b/spec/support/proxy_helper.rb
index 700fe38..a07ee84 100644
--- a/spec/support/proxy_helper.rb
+++ b/spec/support/proxy_helper.rb
@@ -5,11 +5,9 @@ module ProxyHelper
 
   def generate_self_signed_certificate_for(host)
     Dir.chdir License::Management.root.join('tmp') do
-      system([
-        "rm -f #{host}.*",
-        "/usr/bin/openssl req -x509 -newkey rsa:4096 -keyout #{host}.key -out #{host}.crt -days 999 -nodes -subj '/C=/ST=/L=/O=/OU=/CN=*.test' -addext 'subjectAltName=DNS:nuget.test,DNS:rubygems.test,DNS:goproxy.test'",
-        "cat #{host}.* > #{host}.pem"
-      ].join("&&"))
+      system("rm -f #{host}.*")
+      system("/usr/bin/openssl req -x509 -newkey rsa:4096 -keyout #{host}.key -out #{host}.crt -days 999 -nodes -subj '/C=/ST=/L=/O=/OU=/CN=*.test' -addext 'subjectAltName=DNS:nuget.test,DNS:rubygems.test,DNS:goproxy.test'")
+      system("cat #{host}.* > #{host}.pem")
     end
   end