From 9dc8ea4a775bbf7da5a3ad08903e41e25bee0ee0 Mon Sep 17 00:00:00 2001 From: Matt Larraz Date: Wed, 6 Dec 2023 05:50:36 -0500 Subject: [PATCH] Allow custom vendored Ruby URL (#1406) * Allow custom vendored Ruby URL Lets us provide our own custom set of vendored Ruby runtimes. Currently in use on our fork of this repo, but we'd like to merge it upstream. Fixes #1164. * Changelog * Correct changelog PR URL --------- Co-authored-by: Schneems Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com> --- CHANGELOG.md | 2 ++ bin/support/download_ruby | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e79994251..0cfed7906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Main (unreleased) +- Fix BUILDPACK_VENDOR_URL support (https://github.com/heroku/heroku-buildpack-ruby/pull/1406) + ## v262 (2023/11/08) - Warn when relying on default Node.js or Yarn versions (https://github.com/heroku/heroku-buildpack-ruby/pull/1401) diff --git a/bin/support/download_ruby b/bin/support/download_ruby index 37737ba8d..d3087b175 100755 --- a/bin/support/download_ruby +++ b/bin/support/download_ruby @@ -26,7 +26,7 @@ curl_retry_on_18() { regex=".*ruby_version = [\'\"]([0-9]+\.[0-9]+\.[0-9]+)[\'\"].*" if [[ $(cat "$BIN_DIR/../buildpack.toml") =~ $regex ]] then - heroku_buildpack_ruby_url="https://heroku-buildpack-ruby.s3.us-east-1.amazonaws.com/$STACK/ruby-${BASH_REMATCH[1]}.tgz" + heroku_buildpack_ruby_url="${BUILDPACK_VENDOR_URL:-https://heroku-buildpack-ruby.s3.us-east-1.amazonaws.com}/$STACK/ruby-${BASH_REMATCH[1]}.tgz" else echo "Could not detect ruby version to bootstrap" exit 1