NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-bookworm-ruby-3-0-root-certs' into 'master'

Browse source 
Bookworm and Ruby 3.0: Use system root CAs

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/773

Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
This commit is contained in:
Rémy Coutable 2024-02-12 17:46:11 +00:00
commit 363d7330f3
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/install-ruby
View file

@ -129,6 +129,8 @@ function install_custom_openssl_if_needed() {
make
make install
rm -rf /tmp/openssl-${CUSTOM_OPENSSL_VERSION}
rm -r "${CUSTOM_OPENSSL_DIR}/certs"
ln -sf /etc/ssl/certs "${CUSTOM_OPENSSL_DIR}/certs"
# set CONFIGURE_ARGS for ruby builds
export CONFIGURE_ARGS="${CONFIGURE_ARGS:-} --with-openssl-dir=$CUSTOM_OPENSSL_DIR"
fi