Skip to content

Commit 02167e4

Browse files
authored
Remove heroku-20 (#136)
* Drop support for heroku-20 GUS-W-18769381 * clean up stacks/versions table, now with links * Nginx/1.28.0 and other version updates (#138) * Update Nginx to 1.28.0 GUS-W-18226846 * Update headers-more-nginx-module to 0.38 * rebuild nginx with new versions for all stacks * Update Ruby to 3.2.8 GUS-W-18226846
1 parent e8e7329 commit 02167e4

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
build: build-heroku-20 build-heroku-22 build-heroku-24
2-
3-
build-heroku-20:
4-
@echo "Building nginx in Docker for heroku-20..."
5-
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-20" -w /buildpack heroku/heroku:20-build scripts/build_nginx /buildpack/nginx-heroku-20.tgz
1+
build: build-heroku-22 build-heroku-24
62

73
build-heroku-22:
84
@echo "Building nginx in Docker for heroku-22..."

bin/compile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ BUILD_DIR=$1
1010
CACHE_DIR=$2
1111
BUILDPACK_DIR="$(dirname "$(dirname "$0")")"
1212

13-
ruby_version="3.2.4"
14-
if [[ $STACK == heroku-2[02] ]]; then
13+
ruby_version="3.2.8"
14+
if [[ $STACK == "heroku-22" ]]; then
1515
nginx_tarball=nginx-${STACK}.tgz
1616
ruby_tarball=${STACK}/ruby-${ruby_version}.tgz
1717
else

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [unreleased] - YYYY-MM-DD
8+
### Changes
9+
- Drop support for heroku-20
10+
- Update Nginx to 1.28.0
11+
- Update headers-more-nginx-module to 0.38
12+
- Update Ruby to 3.2.8
813

914
## [1.13] - 2024-08-30
1015
### Changes

nginx-heroku-20.tgz

-3.03 MB
Binary file not shown.

nginx-heroku-22.tgz

56.5 KB
Binary file not shown.

nginx-heroku-24-amd64.tgz

58.7 KB
Binary file not shown.

nginx-heroku-24-arm64.tgz

1018 Bytes
Binary file not shown.

readme.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ Nginx-buildpack installs & runs the [Nginx web server](https://nginx.org/) insid
1717

1818
These are auto-selected based on the app's stack at build time.
1919

20-
| Heroku Stack | Nginx Version | PCRE version |
20+
| [Heroku Stack](https://devcenter.heroku.com/articles/stack) | Nginx Version | PCRE version |
2121
|--------------|--------------:|-------------:|
22-
| `Heroku-20` | `1.26.2` | PCRE1 (8.x) |
23-
| `Heroku-22` | `1.26.2` | PCRE1 (8.x) |
24-
| `Heroku-24` | `1.26.2` | PCRE2 (10.x) |
22+
| [Heroku-22](https://devcenter.heroku.com/articles/heroku-22-stack) | 1.28.0 | PCRE1 (8.x) |
23+
| [Heroku-24](https://devcenter.heroku.com/articles/heroku-24-stack) | 1.28.0 | PCRE2 (10.x) |
2524

2625
## Presets
2726

scripts/build_nginx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ set -o pipefail
99
# fail harder
1010
set -eu
1111

12-
NGINX_VERSION=${NGINX_VERSION-1.26.2}
13-
HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.37}
12+
NGINX_VERSION=${NGINX_VERSION-1.28.0}
13+
HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.38}
1414
UUID4_VERSION=${UUID4_VERSION-f8f7ff44e6a8c6cf75232ae4b63d011f2f3b34c1}
1515

1616
nginx_tarball_url=https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
@@ -39,7 +39,7 @@ configure_opts=(
3939
--add-module="${temp_dir}/nginx-${NGINX_VERSION}/headers-more-nginx-module-${HEADERS_MORE_VERSION}"
4040
--add-module="${temp_dir}/nginx-${NGINX_VERSION}/nginx-uuid4-module-${UUID4_VERSION}"
4141
)
42-
if [[ $STACK == heroku-2[02] ]]; then
42+
if [[ $STACK == "heroku-22" ]]; then
4343
# we used to build our own PCRE 8.x, and when moving to dynamic linking, we had to ensure all existing regexes in config files continued to work, so we enforced libpcre3 (8.x) usage instead of the newer PCRE2 (10.x), which has stricter validation for certain patterns (example: /[\w-.]/ is not allowed in PCRE2)
4444
# but for any newer stacks, we can use the more modern PCRE2
4545
configure_opts+=(

0 commit comments

Comments
 (0)