Merge branch 'debian-bullseye' into 'master'v3.25.5

Upgrade packages

See merge request gitlab-org/security-products/license-management!218

2 files changed, 11 insertions, 5 deletions

diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb
index 9362b5b..0e39a61 100644
--- a/lib/license/management/tool_box.rb
+++ b/lib/license/management/tool_box.rb
@@ -3,6 +3,8 @@
 module License
   module Management
     class ToolBox
+      C_BASED_TOOLS = [:php, :python, :ruby].freeze
+
       attr_reader :project_path, :shell
 
       def initialize(shell, project_path)
@@ -15,18 +17,22 @@ module License
           deb = deb_for(tool, version)
           if deb&.exist?
             shell.execute([:dpkg, '-i', deb])
-          elsif tool == :nodejs
-            shell.execute(['/opt/asdf/plugins/nodejs/bin/import-release-team-keyring'])
+          else
+            shell.execute([:asdf, "plugin-update", tool.to_s], env: env)
+            shell.execute(['/opt/asdf/plugins/nodejs/bin/import-release-team-keyring']) if tool == :nodejs
           end
-          shell.execute([:asdf, "plugin-update", tool.to_s], env: env)
           shell.execute([:asdf, :install, tool.to_s, version], env: env)
           shell.execute([:asdf, :local, tool.to_s, version], env: env)
           shell.execute([:asdf, :reshim], env: env)
         end
-
+        install_common_libraries(env: env) if C_BASED_TOOLS.include?(tool.to_sym)
         install_certificates_into_java_keystore(env) if tool == :java
       end
 
+      def install_common_libraries(env: {})
+        shell.execute(['apt-get', 'install', '-y', '-f', '--no-install-recommends', '/opt/toolcache/common/*.deb'], env: env)
+      end
+
       def version_of(tool, env: ENV)
         Dir.chdir(project_path) do
           case tool
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index f1203fc..71f7163 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.25.4'
+    VERSION = '3.25.5'
   end
 end