Add buildpacks available in heroku:22

Author: ipmb

builder/build/appjson.go

@@ -54,6 +54,8 @@ var IncludedBuildpacks = map[string][]string{
 	},
 	"heroku-22": {
 		// $ pack builder inspect heroku/builder:22 -o json | jq '.remote_info.buildpacks[].id'
+		"heroku/deb-packages",
+		"heroku/dotnet",
 		"heroku/go",
 		"heroku/gradle",
 		"heroku/java",
@@ -64,7 +66,7 @@ var IncludedBuildpacks = map[string][]string{
 		"heroku/nodejs-engine",
 		"heroku/nodejs-npm-engine",
 		"heroku/nodejs-npm-install",
-        "heroku/nodejs-pnpm-engine",
+		"heroku/nodejs-pnpm-engine",
 		"heroku/nodejs-pnpm-install",
 		"heroku/nodejs-yarn",
 		"heroku/php",

builder/build/build.go

@@ -140,9 +140,9 @@ func (b *Build) buildWithPack(config *containers.BuildConfig) error {
 	builder := b.BuildpackBuilders()[0]
 	cmdName := "pack"
 	if builder == "heroku/buildpacks:20" {
-		// use legacy pack for heroku/builder:20
+		// use legacy pack for heroku/buildpacks:20
 		cmdName = "pack-legacy"
-		b.Log().Debug().Msg("using legacy pack version for heroku/buildpacks:20")
+		b.Log().Debug().Msg(fmt.Sprintf("using legacy pack version for %s", builder))
 	}
 	cmd := exec.Command(cmdName, "config", "registry-mirrors", "add", "index.docker.io", "--mirror", DockerHubMirror)
 	if err := cmd.Run(); err != nil {
@@ -164,7 +164,7 @@ func (b *Build) buildWithPack(config *containers.BuildConfig) error {
 	}
 	packArgs = append(packArgs, config.Image)
 	b.Log().Debug().Str("builder", builder).Str("buildpacks", buildpacks).Msg("building image")
-	cmd = exec.Command("pack", packArgs...)
+	cmd = exec.Command(cmdName, packArgs...)
 	out := io.MultiWriter(os.Stdout, config.LogFile)
 	cmd.Stdout = out
 	cmd.Stderr = out