diff --git a/habitat/aarch64-darwin/plan.sh b/habitat/aarch64-darwin/plan.sh index db8c5c7b..65636671 100644 --- a/habitat/aarch64-darwin/plan.sh +++ b/habitat/aarch64-darwin/plan.sh @@ -13,7 +13,7 @@ pkg_build_deps=( core/make core/cmake ) -pkg_deps=(${ruby_pkg} core/coreutils core/libarchive) +pkg_deps=(${ruby_pkg} core/coreutils core/libarchive core/cacerts) pkg_svc_user=root @@ -109,6 +109,8 @@ set -e export PATH="$(pkg_path_for ${ruby_pkg})/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:$pkg_prefix/vendor/bin:\$PATH" export DYLD_LIBRARY_PATH="$(pkg_path_for core/libarchive)/lib:\$DYLD_LIBRARY_PATH" +export SSL_CERT_FILE="\${SSL_CERT_FILE:-$(pkg_path_for core/cacerts)/ssl/certs/cacert.pem}" +export SSL_CERT_DIR="\${SSL_CERT_DIR:-$(pkg_path_for core/cacerts)/ssl/certs}" export GEM_HOME="$pkg_prefix/vendor" export GEM_PATH="$pkg_prefix/vendor" export APPBUNDLER_ALLOW_RVM="true" diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 73b1693e..11e4310d 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -12,6 +12,7 @@ $pkg_deps=@( "core/ruby3_4-plus-devkit" "core/libarchive" "core/zlib" + "core/cacerts" ) $pkg_build_deps=@( "core/git" @@ -54,6 +55,7 @@ function Invoke-Build { bundle config --local jobs 4 bundle config --local retry 5 bundle config --local silence_root_warning 1 + if (-not $env:SSL_CERT_FILE) { $env:SSL_CERT_FILE = "$(Get-HabPackagePath 'core/cacerts')/ssl/certs/cacert.pem" } Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies" bundle install diff --git a/habitat/plan.sh b/habitat/plan.sh index 3e652345..38443d93 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -3,7 +3,7 @@ export HAB_REFRESH_CHANNEL="base-2025" pkg_name=chef-cli pkg_origin=chef ruby_pkg="core/ruby3_4" -pkg_deps=(${ruby_pkg} core/coreutils core/libarchive) +pkg_deps=(${ruby_pkg} core/coreutils core/libarchive core/cacerts) pkg_build_deps=( core/make core/gcc @@ -104,6 +104,8 @@ mkdir -p "\${USER_GEM_HOME}" export PATH="$(pkg_path_for ${ruby_pkg})/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\${USER_GEM_HOME}/bin:$pkg_prefix/vendor/bin:\$PATH" export LD_LIBRARY_PATH="$(pkg_path_for core/libarchive)/lib:\$LD_LIBRARY_PATH" +export SSL_CERT_FILE="\${SSL_CERT_FILE:-$(pkg_path_for core/cacerts)/ssl/certs/cacert.pem}" +export SSL_CERT_DIR="\${SSL_CERT_DIR:-$(pkg_path_for core/cacerts)/ssl/certs}" export GEM_HOME="\${USER_GEM_HOME}" export GEM_PATH="\${USER_GEM_HOME}:$pkg_prefix/vendor"