Merge pull request #2178 from edmorley/heroku-builder-24

Add `heroku/builder:24` as a trusted + suggested builder
buildpacks · Jun 5, 2024 · cffbe0b · cffbe0b
2 parents 98f0eb4 + 6c4f1d9
commit cffbe0b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/acceptance/assertions/output.go b/acceptance/assertions/output.go
@@ -224,7 +224,7 @@ func (o OutputAssertionManager) IncludesPrefixedGoogleBuilder() {
 }
 
 var herokuBuilders = []string{
-	"heroku/builder:22",
+	"heroku/builder:24",
 }
 
 func (o OutputAssertionManager) IncludesHerokuBuilders() {

diff --git a/internal/builder/known_builder.go b/internal/builder/known_builder.go
@@ -18,15 +18,22 @@ var KnownBuilders = []KnownBuilder{
 	},
 	{
 		Vendor:             "Heroku",
-		Image:              "heroku/builder:22",
-		DefaultDescription: "Heroku-22 (Ubuntu 22.04) base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala",
+		Image:              "heroku/builder:24",
+		DefaultDescription: "Ubuntu 24.04 AMD64+ARM64 base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala.",
 		Suggested:          true,
 		Trusted:            true,
 	},
+	{
+		Vendor:             "Heroku",
+		Image:              "heroku/builder:22",
+		DefaultDescription: "Ubuntu 22.04 AMD64 base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala.",
+		Suggested:          false,
+		Trusted:            true,
+	},
 	{
 		Vendor:             "Heroku",
 		Image:              "heroku/builder:20",
-		DefaultDescription: "Heroku-20 (Ubuntu 20.04) base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala",
+		DefaultDescription: "Ubuntu 20.04 AMD64 base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala.",
 		Suggested:          false,
 		Trusted:            true,
 	},

diff --git a/internal/commands/build_test.go b/internal/commands/build_test.go
@@ -121,9 +121,9 @@ func testBuildCommand(t *testing.T, when spec.G, it spec.S) {
 						Return(nil)
 
 					logger.WantVerbose(true)
-					command.SetArgs([]string{"image", "--builder", "heroku/builder:22"})
+					command.SetArgs([]string{"image", "--builder", "heroku/builder:24"})
 					h.AssertNil(t, command.Execute())
-					h.AssertContains(t, outBuf.String(), "Builder 'heroku/builder:22' is trusted")
+					h.AssertContains(t, outBuf.String(), "Builder 'heroku/builder:24' is trusted")
 				})
 			})
 		})

diff --git a/internal/commands/builder_inspect_test.go b/internal/commands/builder_inspect_test.go
@@ -254,7 +254,7 @@ func testBuilderInspectCommand(t *testing.T, when spec.G, it spec.S) {
 
 				assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-base'`))
 				assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-full'`))
-				assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:22'`))
+				assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:24'`))
 			})
 		})
 

diff --git a/internal/commands/config_trusted_builder_test.go b/internal/commands/config_trusted_builder_test.go
@@ -59,6 +59,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 				"gcr.io/buildpacks/builder:v1",
 				"heroku/builder:20",
 				"heroku/builder:22",
+				"heroku/builder:24",
 				"paketobuildpacks/builder-jammy-base",
 				"paketobuildpacks/builder-jammy-full",
 				"paketobuildpacks/builder-jammy-tiny",
@@ -73,6 +74,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 				"gcr.io/buildpacks/builder:v1",
 				"heroku/builder:20",
 				"heroku/builder:22",
+				"heroku/builder:24",
 				"paketobuildpacks/builder-jammy-base",
 				"paketobuildpacks/builder-jammy-full",
 				"paketobuildpacks/builder-jammy-tiny",
@@ -94,6 +96,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 				"gcr.io/buildpacks/builder:v1",
 				"heroku/builder:20",
 				"heroku/builder:22",
+				"heroku/builder:24",
 				"paketobuildpacks/builder-jammy-base",
 				"paketobuildpacks/builder-jammy-full",
 				"paketobuildpacks/builder-jammy-tiny",
@@ -111,6 +114,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 				builderName,
 				"heroku/builder:20",
 				"heroku/builder:22",
+				"heroku/builder:24",
 				"paketobuildpacks/builder-jammy-base",
 				"paketobuildpacks/builder-jammy-full",
 				"paketobuildpacks/builder-jammy-tiny",

diff --git a/internal/commands/inspect_builder_test.go b/internal/commands/inspect_builder_test.go
@@ -215,7 +215,7 @@ func testInspectBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 
 				assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-base'`))
 				assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-full'`))
-				assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:22'`))
+				assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:24'`))
 			})
 		})
 

diff --git a/internal/commands/list_trusted_builders_test.go b/internal/commands/list_trusted_builders_test.go
@@ -67,6 +67,7 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
 				"gcr.io/buildpacks/builder:v1",
 				"heroku/builder:20",
 				"heroku/builder:22",
+				"heroku/builder:24",
 				"paketobuildpacks/builder-jammy-base",
 				"paketobuildpacks/builder-jammy-full",
 				"paketobuildpacks/builder-jammy-tiny",
@@ -89,6 +90,7 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
 				builderName,
 				"heroku/builder:20",
 				"heroku/builder:22",
+				"heroku/builder:24",
 				"paketobuildpacks/builder-jammy-base",
 				"paketobuildpacks/builder-jammy-full",
 				"paketobuildpacks/builder-jammy-tiny",