Skip to content

Commit 95e8637

Browse files
committed
Add support for Heroku-26 and bump versions
- Add support for Heroku-26. - Update nginx from 1.28.0 to 1.28.3: https://nginx.org/en/CHANGES-1.28 - Update headers-more-nginx-module from 0.38 to 0.39: openresty/headers-more-nginx-module@v0.38...v0.39 - Update Ruby from 3.2.8 to 3.4.9. I've bundled these into one PR since otherwise the rebase dance would be a pain, given the need to compile/vendor the binaries. GUS-W-20776675.
1 parent 00edbfc commit 95e8637

10 files changed

Lines changed: 23 additions & 9 deletions

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+
- Add support for Heroku-26.
10+
- Update nginx from 1.28.0 to 1.28.3.
11+
- Update headers-more-nginx-module from 0.38 to 0.39.
12+
- Update Ruby from 3.2.8 to 3.4.9.
813

914
## [1.16] - 2026-02-26
1015
### Changes

Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
build: build-heroku-22 build-heroku-24
1+
.PHONY: build build-heroku-22 build-heroku-24 build-heroku-26 shell
2+
3+
build: build-heroku-22 build-heroku-24 build-heroku-26
24

35
build-heroku-22:
46
@echo "Building nginx in Docker for heroku-22..."
5-
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-22" -w /buildpack heroku/heroku:22-build scripts/build_nginx /buildpack/nginx-heroku-22.tgz
7+
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-22" -w /buildpack --platform linux/amd64 heroku/heroku:22-build scripts/build_nginx /buildpack/nginx-heroku-22.tgz
68

79
build-heroku-24:
810
@echo "Building nginx in Docker for heroku-24 (amd64)..."
911
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-24" -w /buildpack --platform linux/amd64 heroku/heroku:24-build scripts/build_nginx /buildpack/nginx-heroku-24-amd64.tgz
1012
@echo "Building nginx in Docker for heroku-24 (arm64)..."
1113
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-24" -w /buildpack --platform linux/arm64 heroku/heroku:24-build scripts/build_nginx /buildpack/nginx-heroku-24-arm64.tgz
1214

15+
build-heroku-26:
16+
@echo "Building nginx in Docker for heroku-26 (amd64)..."
17+
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-26" -w /buildpack --platform linux/amd64 heroku/heroku:26-build scripts/build_nginx /buildpack/nginx-heroku-26-amd64.tgz
18+
@echo "Building nginx in Docker for heroku-26 (arm64)..."
19+
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-26" -w /buildpack --platform linux/arm64 heroku/heroku:26-build scripts/build_nginx /buildpack/nginx-heroku-26-arm64.tgz
20+
1321
shell:
14-
@echo "Opening heroku-22 shell..."
15-
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-22" -e "PORT=5000" -w /buildpack heroku/heroku:22-build bash
22+
@echo "Opening heroku-26 shell..."
23+
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-26" -e "PORT=5000" -w /buildpack heroku/heroku:26-build bash

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ These are auto-selected based on the app's stack at build time.
1919

2020
| [Heroku Stack](https://devcenter.heroku.com/articles/stack) | Nginx Version | PCRE version |
2121
|--------------|--------------:|-------------:|
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) |
22+
| [Heroku-22](https://devcenter.heroku.com/articles/heroku-22-stack) | 1.28.3 | PCRE1 (8.x) |
23+
| [Heroku-24](https://devcenter.heroku.com/articles/heroku-24-stack) | 1.28.3 | PCRE2 (10.x) |
24+
| [Heroku-26](https://devcenter.heroku.com/articles/heroku-26-stack) | 1.28.3 | PCRE2 (10.x) |
2425

2526
## Presets
2627

bin/compile

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

13-
ruby_version="3.2.8"
13+
ruby_version="3.4.9"
1414
if [[ $STACK == "heroku-22" ]]; then
1515
nginx_tarball=nginx-${STACK}.tgz
1616
ruby_tarball=${STACK}/ruby-${ruby_version}.tgz

nginx-heroku-22.tgz

2.71 KB
Binary file not shown.

nginx-heroku-24-amd64.tgz

441 Bytes
Binary file not shown.

nginx-heroku-24-arm64.tgz

59 KB
Binary file not shown.

nginx-heroku-26-amd64.tgz

2.54 MB
Binary file not shown.

nginx-heroku-26-arm64.tgz

2.52 MB
Binary file not shown.

scripts/build_nginx

Lines changed: 2 additions & 2 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.28.0}
13-
HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.38}
12+
NGINX_VERSION=${NGINX_VERSION-1.28.3}
13+
HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.39}
1414
UUID4_VERSION=${UUID4_VERSION-f8f7ff44e6a8c6cf75232ae4b63d011f2f3b34c1}
1515

1616
nginx_tarball_url=https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz

0 commit comments

Comments
 (0)