Skip to content

Commit f1c70d3

Browse files
brahyt-sfedmorley
andauthored
Add support for Heroku-24 (#189)
* Add support for Heroku-24 * try checkout v4 * try checkout v4 * take 3 * rebuilt in linux * rerun from builder * Update Dockerfile Co-authored-by: Ed Morley <[email protected]> * changelog change --------- Co-authored-by: Ed Morley <[email protected]>
1 parent a0c1cbc commit f1c70d3

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check_changelog:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Check that CHANGELOG is touched
@@ -19,15 +19,15 @@ jobs:
1919
test:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: run bats tests
2424
run: docker run -t -v "${PWD}:/code" bats/bats:latest test/*.bats
2525
test-stack:
2626
strategy:
2727
matrix:
28-
stack: [heroku-20, heroku-22]
28+
stack: [heroku-20, heroku-22, heroku-24]
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
- name: run stack test
3333
run: bash test/test-stack.sh ${{ matrix.stack }}

Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Add validation for PGBOUNCER_URLS
44
* Add stack tests
55
* Remove support for Heroku-18
6+
* Add support for Heroku-24
67

78
## v0.13.0 (September 9, 2022)
89
* Update pgbouncer to v1.17.0 for Heroku-18 and Heroku-20 (for parity with Heroku-22)

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
ARG BASE_IMAGE
2-
FROM $BASE_IMAGE
2+
FROM --platform=linux/amd64 $BASE_IMAGE
33

44
ARG STACK
5+
USER root
56
RUN mkdir -p /app /cache /env
67
COPY . /buildpack
78
# Sanitize the environment seen by the buildpack, to prevent reliance on

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
build: build-heroku-20 build-heroku-22
1+
build: build-heroku-20 build-heroku-22 build-heroku-24
22

33
build-heroku-20:
44
@echo "Building pgbouncer in Docker for heroku-20..."
@@ -8,6 +8,10 @@ build-heroku-22:
88
@echo "Building pgbouncer in Docker for heroku-22..."
99
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-22" -w /buildpack heroku/heroku:22-build support/pgbouncer-build
1010

11+
build-heroku-24:
12+
@echo "Building pgbouncer in Docker for heroku-24..."
13+
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-24" -w /buildpack heroku/heroku:24-build support/pgbouncer-build
14+
1115
shell:
12-
@echo "Opening heroku-22 shell..."
13-
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-22" -e "PORT=5000" -w /buildpack heroku/heroku:22-build bash
16+
@echo "Opening heroku-24 shell..."
17+
@docker run -v $(shell pwd):/buildpack --rm -it -e "STACK=heroku-24" -e "PORT=5000" -w /buildpack heroku/heroku:24-build bash

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ that process.
9494

9595
- Heroku-20: `v1.17.0`
9696
- Heroku-22: `v1.17.0`
97+
- Heroku-24: `v1.17.0`
9798

9899
## Multiple Databases
99100
It is possible to connect to multiple databases through pgbouncer by setting

pgbouncer-heroku-24.tgz

773 KB
Binary file not shown.

0 commit comments

Comments
 (0)