From 14678455c176c7ad9675d024e8e2067afc46dfa8 Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 03:53:16 -0400 Subject: [PATCH 01/10] Add heroku/dotnet to builder-24 --- .github/workflows/build-test-publish.yml | 7 ++++++- README.md | 1 + builder-24/builder.toml | 13 +++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 8b5ad646..a334ac79 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - language: ["go", "gradle", "java", "node-js", "php", "python", "ruby", "scala"] + language: ["dotnet", "go", "gradle", "java", "node-js", "php", "python", "ruby", "scala"] builder: ["builder-20", "builder-22", "builder-24"] arch: ["amd64", "arm64"] exclude: @@ -77,6 +77,11 @@ jobs: arch: arm64 - builder: builder-22 arch: arm64 + - builder: builder-20 + language: dotnet + - builder: builder-22 + language: dotnet + steps: - name: Checkout getting started guide diff --git a/README.md b/README.md index 61bafcc1..31d29bdc 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ pack config default-builder heroku/builder:24 For language/buildpack-specific bugs or feature requests, file an issue against the appropriate buildpack repository: +- https://github.com/heroku/buildpacks-dotnet - https://github.com/heroku/buildpacks-go - https://github.com/heroku/buildpacks-jvm - https://github.com/heroku/buildpacks-nodejs diff --git a/builder-24/builder.toml b/builder-24/builder.toml index 4785f544..e9f20b0f 100644 --- a/builder-24/builder.toml +++ b/builder-24/builder.toml @@ -17,6 +17,10 @@ image = "docker.io/heroku/heroku:24-build" image = "docker.io/heroku/heroku:24" mirrors = ["public.ecr.aws/heroku/heroku:24"] +[[buildpacks]] + id = "heroku/dotnet" + uri = "docker://docker.io/heroku/buildpack-dotnet@sha256:0ff6cbece898f615c70e129058f8ef88c94fea8ed2f5cf210606ce5ed924d171" + [[buildpacks]] id = "heroku/go" uri = "docker://docker.io/heroku/buildpack-go@sha256:69ccc6af465bcb3f7a131f3f15ebc975c73f17e33d4216162bd6a52811f7e114" @@ -123,3 +127,12 @@ mirrors = ["public.ecr.aws/heroku/heroku:24"] id = "heroku/procfile" version = "3.1.2" optional = true + +[[order]] + [[order.group]] + id = "heroku/dotnet" + version = "0.1.2" + [[order.group]] + id = "heroku/procfile" + version = "3.1.2" + optional = true From 98629febd6458931bfce34e84086cd268e84ed7d Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 04:01:46 -0400 Subject: [PATCH 02/10] Include .NET in builder-24 description --- builder-24/builder.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder-24/builder.toml b/builder-24/builder.toml index e9f20b0f..2d2c4079 100644 --- a/builder-24/builder.toml +++ b/builder-24/builder.toml @@ -1,4 +1,4 @@ -description = "Ubuntu 24.04 AMD64+ARM64 base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala." +description = "Ubuntu 24.04 AMD64+ARM64 base image with buildpacks for .NET, Go, Java, Node.js, PHP, Python, Ruby & Scala." [stack] id = "heroku-24" From 72e38552599d0e9847d93a1f6940a27348f06732 Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 04:11:38 -0400 Subject: [PATCH 03/10] Add note about .NET support in heroku/builder:24 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 31d29bdc..c7ed88c4 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,8 @@ in each base image, see [this Dev Center article](https://devcenter.heroku.com/a | [heroku/builder:22][builder-tags] | Ubuntu 22.04 | AMD64 | [heroku/heroku:22-cnb][heroku-tags] | 0.20.1 | Available | | [heroku/builder:24][builder-tags] | Ubuntu 24.04 | AMD64 + ARM64 | [heroku/heroku:24][heroku-tags] | 0.20.1 | Recommended | -The builder images above include buildpack support for the following languages: Go, Java, Node.js, PHP, Python, Ruby & Scala. +The builder images above all include buildpack support for the following languages: Go, Java, Node.js, PHP, Python, Ruby & Scala. +Additionally, `heroku/builder:24` include buildpack support for .NET applications. Check the [lifecycle API version support matrix](https://github.com/buildpacks/lifecycle#supported-apis) to determine which Platform and Buildpack API versions are compatible with the `lifecycle` version included in each builder. From 58587eda2bab6e00d571d2788d88596fe2095f36 Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 04:47:16 -0400 Subject: [PATCH 04/10] Remove whitespace Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com> --- .github/workflows/build-test-publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index a334ac79..d09693bc 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -81,7 +81,6 @@ jobs: language: dotnet - builder: builder-22 language: dotnet - steps: - name: Checkout getting started guide From 486a76da40aba1819de48440a2335b4c30108e7a Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 04:47:53 -0400 Subject: [PATCH 05/10] Fix typo Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7ed88c4..50396836 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ in each base image, see [this Dev Center article](https://devcenter.heroku.com/a | [heroku/builder:24][builder-tags] | Ubuntu 24.04 | AMD64 + ARM64 | [heroku/heroku:24][heroku-tags] | 0.20.1 | Recommended | The builder images above all include buildpack support for the following languages: Go, Java, Node.js, PHP, Python, Ruby & Scala. -Additionally, `heroku/builder:24` include buildpack support for .NET applications. +Additionally, `heroku/builder:24` includes buildpack support for .NET applications. Check the [lifecycle API version support matrix](https://github.com/buildpacks/lifecycle#supported-apis) to determine which Platform and Buildpack API versions are compatible with the `lifecycle` version included in each builder. From 5416650708ca160f589f855eb4cf3bff42ab1809 Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 11:02:25 -0400 Subject: [PATCH 06/10] Add heroku/dotnet to builder-22 --- builder-22/builder.toml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/builder-22/builder.toml b/builder-22/builder.toml index 98e715e7..40ace7c4 100644 --- a/builder-22/builder.toml +++ b/builder-22/builder.toml @@ -17,6 +17,10 @@ mirrors = ["public.ecr.aws/heroku/heroku:22-cnb"] [lifecycle] version = "0.20.1" +[[buildpacks]] + id = "heroku/dotnet" + uri = "docker://docker.io/heroku/buildpack-dotnet@sha256:0ff6cbece898f615c70e129058f8ef88c94fea8ed2f5cf210606ce5ed924d171" + [[buildpacks]] id = "heroku/go" uri = "docker://docker.io/heroku/buildpack-go@sha256:69ccc6af465bcb3f7a131f3f15ebc975c73f17e33d4216162bd6a52811f7e114" @@ -123,3 +127,12 @@ version = "0.20.1" id = "heroku/procfile" version = "3.1.2" optional = true + +[[order]] + [[order.group]] + id = "heroku/dotnet" + version = "0.1.2" + [[order.group]] + id = "heroku/procfile" + version = "3.1.2" + optional = true From b0e3cab380df4a7e3857cf668937c50b1e461b0f Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 11:20:56 -0400 Subject: [PATCH 07/10] Update Readme --- README.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 50396836..1cf00d3a 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,11 @@ in each base image, see [this Dev Center article](https://devcenter.heroku.com/a ## Available images -| Builder Image | OS | Supported Architectures | Default Run Image | Lifecycle Version | Status | -|-----------------------------------|--------------|-------------------------|-------------------------------------|-------------------|-------------| -| [heroku/builder:20][builder-tags] | Ubuntu 20.04 | AMD64 | [heroku/heroku:20-cnb][heroku-tags] | 0.20.1 | Deprecated | -| [heroku/builder:22][builder-tags] | Ubuntu 22.04 | AMD64 | [heroku/heroku:22-cnb][heroku-tags] | 0.20.1 | Available | -| [heroku/builder:24][builder-tags] | Ubuntu 24.04 | AMD64 + ARM64 | [heroku/heroku:24][heroku-tags] | 0.20.1 | Recommended | - -The builder images above all include buildpack support for the following languages: Go, Java, Node.js, PHP, Python, Ruby & Scala. -Additionally, `heroku/builder:24` includes buildpack support for .NET applications. +| Builder Image | OS | Architectures | Supported Language Buildpacks | Status | +|-----------------------------------|--------------|---------------|----------------------------------------------------|-------------| +| [heroku/builder:20][builder-tags] | Ubuntu 20.04 | AMD64 | Go, Java, Node.js, PHP, Python, Ruby & Scala | Deprecated | +| [heroku/builder:22][builder-tags] | Ubuntu 22.04 | AMD64 | .NET, Go, Java, Node.js, PHP, Python, Ruby & Scala | Available | +| [heroku/builder:24][builder-tags] | Ubuntu 24.04 | AMD64 + ARM64 | .NET, Go, Java, Node.js, PHP, Python, Ruby & Scala | Recommended | Check the [lifecycle API version support matrix](https://github.com/buildpacks/lifecycle#supported-apis) to determine which Platform and Buildpack API versions are compatible with the `lifecycle` version included in each builder. @@ -71,4 +68,3 @@ For anything else (including more general feature requests or questions), use: https://github.com/heroku/buildpacks/discussions [builder-tags]: https://hub.docker.com/r/heroku/builder/tags -[heroku-tags]: https://hub.docker.com/r/heroku/heroku/tags From 91743ec5277562710716b8cca2ff386990f6d87e Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 11:32:17 -0400 Subject: [PATCH 08/10] Don't exclude dotnet from builder-22 --- .github/workflows/build-test-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index d09693bc..9a95cf79 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -79,8 +79,6 @@ jobs: arch: arm64 - builder: builder-20 language: dotnet - - builder: builder-22 - language: dotnet steps: - name: Checkout getting started guide From 74e3b4ce21511daa0c7a5346f5f76f2412568d6f Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 13:18:21 -0400 Subject: [PATCH 09/10] Update readme --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1cf00d3a..cd3e876e 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,14 @@ in each base image, see [this Dev Center article](https://devcenter.heroku.com/a ## Available images -| Builder Image | OS | Architectures | Supported Language Buildpacks | Status | -|-----------------------------------|--------------|---------------|----------------------------------------------------|-------------| -| [heroku/builder:20][builder-tags] | Ubuntu 20.04 | AMD64 | Go, Java, Node.js, PHP, Python, Ruby & Scala | Deprecated | -| [heroku/builder:22][builder-tags] | Ubuntu 22.04 | AMD64 | .NET, Go, Java, Node.js, PHP, Python, Ruby & Scala | Available | -| [heroku/builder:24][builder-tags] | Ubuntu 24.04 | AMD64 + ARM64 | .NET, Go, Java, Node.js, PHP, Python, Ruby & Scala | Recommended | +| Builder Image | OS | Supported Architectures | Default Run Image | Lifecycle Version | Status | +|-----------------------------------|--------------|-------------------------|-------------------------------------|-------------------|-------------| +| [heroku/builder:20][builder-tags] | Ubuntu 20.04 | AMD64 | [heroku/heroku:20-cnb][heroku-tags] | 0.20.1 | Deprecated | +| [heroku/builder:22][builder-tags] | Ubuntu 22.04 | AMD64 | [heroku/heroku:22-cnb][heroku-tags] | 0.20.1 | Available | +| [heroku/builder:24][builder-tags] | Ubuntu 24.04 | AMD64 + ARM64 | [heroku/heroku:24][heroku-tags] | 0.20.1 | Recommended | + +The builder images above include buildpack support for the following languages: Go, Java, Node.js, PHP, Python, Ruby & Scala. +Additionally, `heroku/builder:22` and `heroku/builder:24` includes buildpack support for .NET applications. Check the [lifecycle API version support matrix](https://github.com/buildpacks/lifecycle#supported-apis) to determine which Platform and Buildpack API versions are compatible with the `lifecycle` version included in each builder. @@ -68,3 +71,4 @@ For anything else (including more general feature requests or questions), use: https://github.com/heroku/buildpacks/discussions [builder-tags]: https://hub.docker.com/r/heroku/builder/tags +[heroku-tags]: https://hub.docker.com/r/heroku/heroku/tags From 7d51fafcfa06209df87455fffce13572434ce54f Mon Sep 17 00:00:00 2001 From: Rune Soerensen Date: Thu, 29 Aug 2024 13:32:10 -0400 Subject: [PATCH 10/10] Add .NET reference in builder-22 description --- builder-22/builder.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder-22/builder.toml b/builder-22/builder.toml index 40ace7c4..3b089f82 100644 --- a/builder-22/builder.toml +++ b/builder-22/builder.toml @@ -1,4 +1,4 @@ -description = "Ubuntu 22.04 AMD64 base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala." +description = "Ubuntu 22.04 AMD64 base image with buildpacks for .NET, Go, Java, Node.js, PHP, Python, Ruby & Scala." [stack] id = "heroku-22"