From a002e39396527481ee4c330ffc4a133bf96dc117 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 11 Aug 2024 04:17:16 -0400
Subject: [PATCH] feat: build and default to heroku-24 based image

---
 .github/workflows/main.yml        | 2 ++
 .github/workflows/release.yml     | 3 ++-
 .github/workflows/tag-release.yml | 4 ++--
 Makefile                          | 2 ++
 README.md                         | 2 +-
 contrib/post-install              | 4 ++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4e1e10028..2f47cae04 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,7 @@ jobs:
         heroku:
           - 20
           - 22
+          - 24
 
     steps:
       - uses: actions/checkout@v4
@@ -113,6 +114,7 @@ jobs:
         heroku:
           - 20
           - 22
+          - 24
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index abdef2013..30e1a8618 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ name: release
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   build:
@@ -17,6 +17,7 @@ jobs:
         heroku:
           - 20
           - 22
+          - 24
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
index 6c6ea72fa..a28488abf 100644
--- a/.github/workflows/tag-release.yml
+++ b/.github/workflows/tag-release.yml
@@ -17,7 +17,7 @@ jobs:
         buildx:
           - "false"
         heroku:
-          - 22
+          - 24
 
     steps:
       - uses: actions/checkout@v4
@@ -70,7 +70,7 @@ jobs:
       - name: download packages
         uses: actions/download-artifact@v4
         with:
-          name: build-22-false
+          name: build-24-false
           path: build
 
       - name: Login to DockerHub
diff --git a/Makefile b/Makefile
index 494f318db..c797e5b99 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ build: bindata.go
 build/docker:
 	$(MAKE) build/docker/20 STACK_VERSION=20
 	$(MAKE) build/docker/22 STACK_VERSION=22
+	$(MAKE) build/docker/24 STACK_VERSION=24
 
 build/docker/$(STACK_VERSION): bindata.go
 ifeq ($(BUILDX),true)
@@ -128,6 +129,7 @@ clean:
 deps: bindata.go
 	docker pull heroku/heroku:20-build
 	docker pull heroku/heroku:22-build
+	docker pull heroku/heroku:24-build
 	cd / && go get -u github.com/progrium/basht/...
 	$(MAKE) bindata.go
 	go get || true
diff --git a/README.md b/README.md
index 4fa4615aa..5664d896a 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ A command line tool for emulating Heroku build and runtime tasks in containers.
 
 Herokuish is made for platform authors. The project consolidates and decouples Heroku compatibility logic (running buildpacks, parsing Procfile) and supporting workflow (importing/exporting slugs) from specific platform images like those in Dokku/Buildstep, Deis, Flynn, etc.
 
-The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:20, and Heroku:22 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility.
+The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:20, Heroku:22, and Heroku:24 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility.
 
 Herokuish is a community project and is in no way affiliated with Heroku.
 
diff --git a/contrib/post-install b/contrib/post-install
index 0c9c0c4a6..8eefe6349 100644
--- a/contrib/post-install
+++ b/contrib/post-install
@@ -19,5 +19,5 @@ fi
 
 VERSION=$(cat /var/lib/herokuish/VERSION)
 
-sudo docker pull "gliderlabs/herokuish:v${VERSION}-22"
-sudo docker tag "gliderlabs/herokuish:v${VERSION}-22" gliderlabs/herokuish:latest-22
+sudo docker pull "gliderlabs/herokuish:v${VERSION}-24"
+sudo docker tag "gliderlabs/herokuish:v${VERSION}-24" gliderlabs/herokuish:latest-24