builder: update railpack to 0.17.1 with new providers

Author: bbedward

ent/migrate/schema.go

@@ -8,84 +8,75 @@ import (
 	"github.com/railwayapp/railpack/core/generate"
 )
 
-// Detect framework based on provider and plan
 func DetectFramework(provider Provider, ctx *generate.GenerateContext) Framework {
 	switch provider {
-	// Node frameworks
 	case Node:
 		framework, ok := ctx.Metadata.Properties["nodeRuntime"]
-		if ok {
-			switch framework {
-			case "next":
-				return Next
-			case "astro":
-				return Astro
-			case "vite":
-				return Vite
-			case "cra":
-				return CRA
-			case "angular":
-				return Angular
-			case "remix":
-				return Remix
-			case "bun":
-				return BunFW
-			case "express":
-				return Express
-			}
+		if !ok {
+			return UnknownFramework
+		}
+		switch framework {
+		case "next":
+			return Next
+		case "nuxt":
+			return Nuxt
+		case "astro":
+			return Astro
+		case "vite":
+			return Vite
+		case "cra":
+			return CRA
+		case "angular":
+			return Angular
+		case "remix":
+			return Remix
+		case "tanstack-start":
+			return TanstackStart
+		case "react-router":
+			return ReactRouter
+		case "bun":
+			return BunFW
+		case "static":
+			return StaticFW
 		}
-	// Python frameworks
 	case Python:
 		framework, ok := ctx.Metadata.Properties["pythonRuntime"]
-		if ok {
-			switch framework {
-			case "python":
-				return PythonFramework
-			case "django":
-				return Django
-			case "flask":
-				return Flask
-			case "fastapi":
-				return FastAPI
-			case "fasthtml":
-				return FastHTML
-			}
+		if !ok {
+			return UnknownFramework
+		}
+		switch framework {
+		case "django":
+			return Django
+		case "flask":
+			return Flask
+		case "fastapi":
+			return FastAPI
+		case "fasthtml":
+			return FastHTML
 		}
-	// Go frameworks
 	case Go:
-		gin, ok := ctx.Metadata.Properties["goGin"]
-		if ok && gin == "true" {
+		if ctx.Metadata.Properties["goGin"] == "true" {
 			return Gin
 		}
-	// Java frameworks
 	case Java:
-		javaFramework, ok := ctx.Metadata.Properties["javaFramework"]
-		if ok {
-			switch javaFramework {
-			case "spring-boot":
-				return SpringBoot
-			}
+		if ctx.Metadata.Properties["javaFramework"] == "spring-boot" {
+			return SpringBoot
 		}
-	// PHP frameworks
 	case PHP:
-		for _, log := range ctx.Logger.Logs {
-			if strings.Contains(strings.ToLower(log.Msg), "laravel") {
-				return Laravel
-			}
+		if ctx.Metadata.Properties["phpLaravel"] == "true" {
+			return Laravel
 		}
-	// Ruby frameworks
 	case Ruby:
-		railsFramework, ok := ctx.Metadata.Properties["rubyRails"]
-		if ok && railsFramework == "true" {
+		if ctx.Metadata.Properties["rubyRails"] == "true" {
 			return Rails
 		}
-		// Rust frameworks
 	case Rust:
-		if ctx.Deploy != nil {
-			for _, variable := range ctx.Deploy.Variables {
-				if strings.EqualFold(variable, "rocket_address") {
-					return Rocket
-				}
+		if ctx.Deploy == nil {
+			return UnknownFramework
+		}
+		for _, variable := range ctx.Deploy.Variables {
+			if strings.EqualFold(variable, "rocket_address") {
+				return Rocket
 			}
 		}
 	}
@@ -97,43 +88,38 @@ func DetectFramework(provider Provider, ctx *generate.GenerateContext) Framework
 type Framework string
 
 const (
-	// * node frameworks
-	Next          Framework = "next"
-	Astro         Framework = "astro"
-	Vite          Framework = "vite"
-	CRA           Framework = "cra"
-	Angular       Framework = "angular"
-	Remix         Framework = "remix"
-	BunFW         Framework = "bun"
-	Express       Framework = "express"
-	Sveltekit     Framework = "sveltekit"
-	Svelte        Framework = "svelte"
-	Solid         Framework = "solid"
-	Hono          Framework = "hono"
-	TanstackStart Framework = "tanstack-start"
-	// * python frameworks
-	PythonFramework Framework = "python" // Sometimes detected as a framework
-	Django          Framework = "django"
-	Flask           Framework = "flask"
-	FastAPI         Framework = "fastapi"
-	FastHTML        Framework = "fasthtml"
-	// * GO frameworks
-	Gin Framework = "gin"
-	// * Java frameworks
-	SpringBoot Framework = "spring-boot"
-	// * PHP frameworks
-	Laravel Framework = "laravel"
-	// * Ruby frameworks
-	Rails Framework = "rails"
-	// * Rust frameworks
-	Rocket Framework = "rocket"
-	// * not detected
+	Next             Framework = "next"
+	Nuxt             Framework = "nuxt"
+	Astro            Framework = "astro"
+	Vite             Framework = "vite"
+	CRA              Framework = "cra"
+	Angular          Framework = "angular"
+	Remix            Framework = "remix"
+	TanstackStart    Framework = "tanstack-start"
+	ReactRouter      Framework = "react-router"
+	BunFW            Framework = "bun"
+	StaticFW         Framework = "static"
+	Sveltekit        Framework = "sveltekit"
+	Svelte           Framework = "svelte"
+	Solid            Framework = "solid"
+	Hono             Framework = "hono"
+	Express          Framework = "express"
+	Django           Framework = "django"
+	Flask            Framework = "flask"
+	FastAPI          Framework = "fastapi"
+	FastHTML         Framework = "fasthtml"
+	Gin              Framework = "gin"
+	SpringBoot       Framework = "spring-boot"
+	Laravel          Framework = "laravel"
+	Rails            Framework = "rails"
+	Rocket           Framework = "rocket"
 	UnknownFramework Framework = "unknown"
 )
 
 var allFrameworks = []Framework{
-	Next, Astro, Vite, CRA, Angular, Remix, BunFW, Express, Sveltekit, Svelte, Solid, Hono, TanstackStart,
-	PythonFramework, Django, Flask, FastAPI, FastHTML,
+	Next, Nuxt, Astro, Vite, CRA, Angular, Remix, TanstackStart, ReactRouter, BunFW, StaticFW,
+	Sveltekit, Svelte, Solid, Hono, Express,
+	Django, Flask, FastAPI, FastHTML,
 	Gin,
 	SpringBoot,
 	Laravel,

ent/serviceconfig/serviceconfig.go

@@ -8,13 +8,11 @@ import (
 
 // Parses detected providers into Provider
 func ParseProvider(detectedProviders []string) Provider {
-	provider := ""
-	// Always use the first one?
-	if len(detectedProviders) > 0 {
-		provider = detectedProviders[0]
+	if len(detectedProviders) == 0 {
+		return UnknownProvider
 	}
 
-	switch provider {
+	switch detectedProviders[0] {
 	case "node":
 		return Node
 	case "deno":
@@ -33,10 +31,18 @@ func ParseProvider(detectedProviders []string) Provider {
 		return Ruby
 	case "rust":
 		return Rust
-	case "elixir":
+	case "elixir", "Elixir":
 		return Elixir
 	case "staticfile":
 		return Staticfile
+	case "dotnet", "Dotnet":
+		return Dotnet
+	case "cpp":
+		return Cpp
+	case "gleam":
+		return Gleam
+	case "shell":
+		return Shell
 	default:
 		return UnknownProvider
 	}
@@ -57,10 +63,14 @@ const (
 	Rust            Provider = "rust"
 	Elixir          Provider = "elixir"
 	Staticfile      Provider = "staticfile"
+	Dotnet          Provider = "dotnet"
+	Cpp             Provider = "cpp"
+	Gleam           Provider = "gleam"
+	Shell           Provider = "shell"
 	UnknownProvider Provider = "unknown"
 )
 
-var allProviders = []Provider{Node, Deno, Bun, Go, Java, PHP, Python, Ruby, Rust, Elixir, Staticfile, UnknownProvider}
+var allProviders = []Provider{Node, Deno, Bun, Go, Java, PHP, Python, Ruby, Rust, Elixir, Staticfile, Dotnet, Cpp, Gleam, Shell, UnknownProvider}
 
 // Values provides list valid values for Enum.
 func (Provider) Values() (kinds []string) {

go.mod

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containerd/platforms"
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/config/types"
 	"github.com/moby/buildkit/client"
@@ -15,6 +16,7 @@ import (
 	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/moby/buildkit/session/secrets/secretsprovider"
 	"github.com/moby/buildkit/util/appcontext"
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	rpBuildkit "github.com/railwayapp/railpack/buildkit"
 	"github.com/railwayapp/railpack/core/plan"
 	"github.com/tonistiigi/fsutil"
@@ -25,7 +27,7 @@ import (
 type BuildWithBuildkitClientOptions struct {
 	ImageName         string
 	RailpackBuildPlan *plan.BuildPlan
-	Platform          rpBuildkit.BuildPlatform
+	Platform          specs.Platform
 	SecretsHash       string
 	Secrets           map[string]string
 	CacheKey          string
@@ -80,8 +82,8 @@ func BuildWithBuildkitClient(cfg *config.Config, appDir string, opts BuildWithBu
 	}
 
 	buildPlatform := opts.Platform
-	if (buildPlatform == rpBuildkit.BuildPlatform{}) {
-		buildPlatform = rpBuildkit.DetermineBuildPlatformFromHost()
+	if buildPlatform.OS == "" {
+		buildPlatform, _ = rpBuildkit.ParsePlatformWithDefaults("")
 	}
 
 	// Setup channel for progress monitoring
@@ -114,7 +116,7 @@ func BuildWithBuildkitClient(cfg *config.Config, appDir string, opts BuildWithBu
 		return fmt.Errorf("error creating context FS: %w", err)
 	}
 
-	log.Infof("Building image for %s with BuildKit %s", buildPlatform.String(), info.BuildkitVersion.Version)
+	log.Infof("Building image for %s with BuildKit %s", platforms.Format(buildPlatform), info.BuildkitVersion.Version)
 	log.Infof("Using context path: %s", contextPath)
 
 	secretsMap := make(map[string][]byte)
@@ -149,7 +151,7 @@ func BuildWithBuildkitClient(cfg *config.Config, appDir string, opts BuildWithBu
 
 		// Create the auth provider configuration
 		authProviderCfg := authprovider.DockerAuthProviderConfig{
-			ConfigFile: configFile,
+			AuthConfigProvider: authprovider.LoadAuthConfig(configFile),
 		}
 
 		sessionAttachables = append(sessionAttachables, authprovider.NewDockerAuthProvider(authProviderCfg))
@@ -205,13 +207,12 @@ func BuildWithBuildkitClient(cfg *config.Config, appDir string, opts BuildWithBu
 			"filename": dockerfileBasename,
 		}
 	} else if opts.RailpackBuildPlan != nil {
-		// Using RailPack BuildPlan
 		buildPlatform := opts.Platform
-		if (buildPlatform == rpBuildkit.BuildPlatform{}) {
-			buildPlatform = rpBuildkit.DetermineBuildPlatformFromHost()
+		if buildPlatform.OS == "" {
+			buildPlatform, _ = rpBuildkit.ParsePlatformWithDefaults("")
 		}
 
-		log.Infof("Building image for %s with BuildKit %s", buildPlatform.String(), info.BuildkitVersion.Version)
+		log.Infof("Building image for %s with BuildKit %s", platforms.Format(buildPlatform), info.BuildkitVersion.Version)
 
 		llbState, image, err := rpBuildkit.ConvertPlanToLLB(opts.RailpackBuildPlan, rpBuildkit.ConvertPlanOptions{
 			BuildPlatform: buildPlatform,