Merge branch 'bash-login' into 'master'

Explicitly source bashrc

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

5 files changed, 10 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d55c23..c35e446 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.22.1
+
+- Fix bug with loading `.bashrc`. (!206)
+
 ## v3.22.0
 
 - Unpack mono from custom built deb package (!204)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8053899..1b6fff4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    license-management (3.22.0)
+    license-management (3.22.1)
       license_finder (~> 6.6.0)
 
 GEM
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 518fa69..36c4cf3 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.22.0'
+    VERSION = '3.22.1'
   end
 end
diff --git a/run.sh b/run.sh
index 89c2abe..ec4ea06 100755
--- a/run.sh
+++ b/run.sh
@@ -1,6 +1,9 @@
 #!/bin/bash -l
 
 set -e
+# shellcheck disable=SC1091
+. /opt/gitlab/.bashrc || true
+
 [[ -z ${SETUP_CMD:-} ]] && set -uo pipefail
 
 export ASDF_JAVA_VERSION="${ASDF_JAVA_VERSION:-}"
diff --git a/spec/support/proxy_helper.rb b/spec/support/proxy_helper.rb
index 9ad0dde..1f31164 100644
--- a/spec/support/proxy_helper.rb
+++ b/spec/support/proxy_helper.rb
@@ -39,6 +39,6 @@ RSpec.configure do |config|
     system("rm -f /usr/lib/ssl/certs/custom.*")
     system("update-ca-certificates -v")
     system("c_rehash -v")
-    system("cert_sync /etc/ssl/certs/ca-certificates.crt")
+    system("/opt/asdf/installs/mono/6.8.0.123/bin/cert-sync /etc/ssl/certs/ca-certificates.crt")
   end
 end