chore(builds): Merge upstream and add heroku-22 build #2
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
* remove references to cedar-14 * update changelog Co-authored-by: Ben Fritsch <bfritsch@bfritsch-ltm2.internal.salesforce.com>
* rename master -> main * changelog
* update to nginx 1.20 * avoid rebuilding for heroku-16
* removing heroku-16. closes heroku/heroku-buildpack-nginx#78 * update changelog
* nginx 1.20.1 addressing CVE-2021-23017 #82 * changelog
* Update nginx.conf.erb * Update nginx-solo-sample.conf.erb * Update nginx-nextjs-with-forcessl.conf.erb
* updates * add binaries * changelog * bump zlib * update changelog * add new archives
Binary generated using `make build-heroku-22`. GUS-W-10346716.
Follow-up to #96.
To pick up #96. GUS-W-10346716.
The ERB templating feature of this buildpack requires that the `erb` command (part of Ruby) be available at runtime, in order that the nginx config templates can be rendered into a valid nginx config. On Heroku-22 the stack image no longer includes a system Ruby installation, so in order for this buildpack to continue to work, a Ruby install must be vendored by this buildpack. If an app already uses the Ruby buildpack, and that buildpack is ordered prior to the nginx buildpack, then this buildpack will skip the Ruby vendoring step to save installing a redundant copy of Ruby. Fixes #101. GUS-W-11321729.
Dottenpixel
force-pushed
the
chore/upstream-merge
branch
from
9c733dd
to
8baeee1
Compare
Signed-off-by: Fred Boyle <fboyle@salesforce.com>
Dottenpixel
force-pushed
the
chore/upstream-merge
branch
from
ec0b923
to
1b7f38b
Compare
Dottenpixel
force-pushed
the
chore/upstream-merge
branch
from
9147ca7
to
cbcc5d9
Compare
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.
This work:
cedar-14andheroku-16, and addsheroku-22zlibto1.2.13because attempts to build using1.2.12didn't make viable builds