diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-05-21 13:44:04 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-05-21 13:44:04 +0000 |
| commit | 537fbadd38b8f67b4a8f1ea0089a9e5ad2aa82eb (patch) | |
| tree | c0e1075bb9be0abe5d5c9702b58fb745220f5ccf /lib/license/finder/ext | |
| parent | ffe3851eaf675da0bc82f144c48b7b16cc43d989 (diff) | |
| parent | d018033cf5542bf35ff7e60d28806655f5ea83ed (diff) | |
Merge branch '212923-bower-small' into 'master'v3.9.2
Provide Bower with a `bower_ca` variable when a custom CA is specified.
See merge request gitlab-org/security-products/license-management!151
Diffstat (limited to 'lib/license/finder/ext')
| -rw-r--r-- | lib/license/finder/ext/bower.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/license/finder/ext/bower.rb b/lib/license/finder/ext/bower.rb index ccfa7ee..d288b05 100644 --- a/lib/license/finder/ext/bower.rb +++ b/lib/license/finder/ext/bower.rb @@ -48,7 +48,10 @@ module LicenseFinder def default_env return {} unless shell.custom_certificate_installed? - { 'NPM_CONFIG_CAFILE' => ENV.fetch('NPM_CONFIG_CAFILE', shell.custom_certificate_path.to_s) } + { + 'NPM_CONFIG_CAFILE' => ENV.fetch('NPM_CONFIG_CAFILE', shell.custom_certificate_path.to_s), + 'bower_ca' => ENV.fetch('bower_ca', shell.custom_certificate_path.to_s) + } end end end |