Merge pull request #1469 from gliderlabs/drop-heroku-20

chore: drop support for heroku-20

Author: josegonzalez

Diff for: .github/workflows/main.yml

@@ -25,7 +25,6 @@ jobs:
           - "true"
           - "false"
         heroku:
-          - 20
           - 22
           - 24
 
@@ -112,7 +111,6 @@ jobs:
           - buildpack-scala
           - buildpack-static
         heroku:
-          - 20
           - 22
           - 24
 

Diff for: .github/workflows/release.yml

@@ -15,7 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         heroku:
-          - 20
           - 22
           - 24
 

Diff for: Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG STACK_VERSION=20
+ARG STACK_VERSION=22
 
 FROM golang:1.24 AS builder
 RUN mkdir /src
@@ -10,7 +10,7 @@ ARG VERSION
 RUN go build -a -ldflags "-X main.Version=$VERSION" -o herokuish .
 
 FROM ubuntu:${STACK_VERSION}.04 AS base
-ARG STACK_VERSION=20
+ARG STACK_VERSION=22
 ARG TARGETARCH
 
 ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh

Diff for: Makefile

@@ -14,7 +14,7 @@ SHELL := /bin/bash
 SYSTEM := $(shell sh -c 'uname -s 2>/dev/null')
 DOCKER_ARGS ?= "--pull"
 BUILDX ?= true
-STACK_VERSION ?= 20
+STACK_VERSION ?= 22
 
 shellcheck:
 ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0)
@@ -55,17 +55,12 @@ build: bindata.go
 	$(MAKE) build/deb/$(NAME)_$(VERSION)_all.deb
 
 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)
-ifeq ($(STACK_VERSION),20)
-	docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest .
-else
 	docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) .
-endif
 else
 	docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) .
 endif
@@ -127,7 +122,6 @@ clean:
 	docker rmi herokuish:dev || true
 
 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/...

Diff for: 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, Heroku:22, and Heroku:24 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: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.
 
@@ -208,7 +208,7 @@ $ docker run --rm -e TRACE=true -v /abs/app/path:/tmp/app gliderlabs/herokuish /
 You can also set a custom buildpack:
 
 ```shell
-docker run -e BUILDPACK_URL="https://github.com/custom/buildpack.git#with-a-branch" -e STACK=heroku-20 -e TRACE=true --rm -v ./:/tmp/app -it gliderlabs/herokuish /bin/herokuish test
+docker run -e BUILDPACK_URL="https://github.com/custom/buildpack.git#with-a-branch" -e STACK=heroku-22 -e TRACE=true --rm -v ./:/tmp/app -it gliderlabs/herokuish /bin/herokuish test
 ```
 
 Note that the underlying buildpacks will not trace their commands with `TRACE=true` is enabled. They need to independently set `set -x` in order to trace execution.

Diff for: include/buildpack.bash

@@ -158,7 +158,7 @@ buildpack-setup() {
   # shellcheck disable=SC2154
   export HOME="$app_path"
   export REQUEST_ID="build-$RANDOM"
-  export STACK="${STACK:-heroku-20}"
+  export STACK="${STACK:-heroku-22}"
   # build_path defined in outer scope
   # shellcheck disable=SC2154
   cp -r "$app_path/." "$build_path"