Heroku-24 and multi-arch (arm/amd) #1439
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schneems
force-pushed
the
schneems/heroku-24
branch
8 times, most recently
from
624ff61 to
c96e82b
Compare
joshwlewis
reviewed
Apr 12, 2024
joshwlewis
reviewed
Apr 12, 2024
joshwlewis
reviewed
Apr 12, 2024
joshwlewis
requested changes
Apr 12, 2024
There was a problem hiding this comment.
I'd suggest reframing this PR as heroku-24 support (without the arm64 stuff). There's really no way to activate the arm64 codepath (aside from unit tests), so we probably shouldn't be advertising support for it (I think it's totally fine to have the arm64 codepath, though).
schneems
changed the title
schneems
force-pushed
the
schneems/heroku-24
branch
from
c96e82b to
8ea32f8
Compare
schneems
changed the title
|
@joshwlewis I split up this PR into three PRs: |
edmorley
reviewed
Apr 15, 2024
schneems
force-pushed
the
schneems/heroku-24
branch
from
8ea32f8 to
9ef927c
Compare
Heroku-24 base image supports two architectures amd64 and arm64. We've built binaries for these two architectures heroku/docker-heroku-ruby-builder#38. Effectively this means that the s3 bucket that holds the Ruby binaries has an additional folder. Previously files were at `<stack>/ruby-<version>.tgz` now they are at `<stack>/<arch>/ruby-<version>.tgz` but only for `heroku-24` and future stacks moving forward. To support multiple architectures, the buildpack needs to detect the current architecture and whether or not the current stack supports multiple architectures. Beyond downloading binaries, the buildpack is aware of the S3 structure to travers version numbers in order to warn customers when a newer version of a ruby version is available. We also warn customers if their current Ruby version is not available on the next stack. This behavior is implemented and tested in this commit, however we're not turning on warnings for `heroku-24` yet as customers cannot currently use it.
schneems
force-pushed
the
schneems/heroku-24
branch
from
9ef927c to
da64f44
Compare
|
Updated to use |
joshwlewis
approved these changes
Apr 16, 2024
Merged
schneems
added a commit
to heroku/docker-heroku-jruby-builder
that referenced
this pull request
May 23, 2024
- Rewrites the project to use a pre-built JRuby binary. Links to downloads are at https://www.jruby.org/download. - Adds the heroku-24 base image as a build target - Re-uses the ARM url format for S3 that was introduced in heroku/docker-heroku-ruby-builder#38. Both the Ruby classic buildpack and CNB are tightly coupled to this format and will attempt to download binaries from S3 with cpu architecture information on heroku-24. Once built and uploaded to S3 there should be no changes needed to the buildpack to acquire support for heroku-24 and ARM due to: - heroku/heroku-buildpack-ruby#1439 - heroku/buildpacks-ruby#284
schneems
added a commit
to heroku/docker-heroku-jruby-builder
that referenced
this pull request
May 23, 2024
* Add Heroku-24 and ARM support - Rewrites the project to use a pre-built JRuby binary. Links to downloads are at https://www.jruby.org/download. - Adds the heroku-24 base image as a build target - Re-uses the ARM url format for S3 that was introduced in heroku/docker-heroku-ruby-builder#38. Both the Ruby classic buildpack and CNB are tightly coupled to this format and will attempt to download binaries from S3 with cpu architecture information on heroku-24. Once built and uploaded to S3 there should be no changes needed to the buildpack to acquire support for heroku-24 and ARM due to: - heroku/heroku-buildpack-ruby#1439 - heroku/buildpacks-ruby#284 * Remove unused directory Prior to #33 a script was generated for every Ruby version on every stack to execute docker. This is no longer needed, we can get rid of this directory.
edmorley
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Heroku-24 base image supports two architectures amd64 and arm64. We've built binaries for these two architectures heroku/docker-heroku-ruby-builder#38. Effectively this means that the s3 bucket that holds the Ruby binaries has an additional folder. Previously files were at
<stack>/ruby-<version>.tgznow they are at<stack>/<arch>/ruby-<version>.tgzbut only forheroku-24and future stacks moving forward.To support multiple architectures, the buildpack needs to detect the current architecture and whether or not the current stack supports multiple architectures.
Beyond downloading binaries, the buildpack is aware of the S3 structure to travers version numbers in order to warn customers when a newer version of a ruby version is available. We also warn customers if their current Ruby version is not available on the next stack. This behavior is implemented and tested in this PR, however we're not turning on warnings for
heroku-24yet as customers cannot currently use it.