Rails node ports for UI (#2802)

* Provide better default ports for Node and Rails for --ui
    * add Port to launch plan
    * remove code which would overwrite user's choice of port

Author: rubys

internal/command/launch/plan_builder.go

@@ -120,6 +120,9 @@ func buildManifest(ctx context.Context) (*LaunchManifest, *planBuildCache, error
 			lp.Redis = plan.DefaultRedis(lp)
 			planSource.redisSource = scannerSource
 		}
+		if srcInfo.Port != 0 {
+			lp.HttpServicePort = srcInfo.Port
+		}
 	}
 
 	return &LaunchManifest{

scanner/jsFramework.go

@@ -10,7 +10,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/blang/semver"
@@ -183,6 +182,9 @@ func configureJsFramework(sourceDir string, config *ScannerConfig) (*SourceInfo,
 		srcInfo.SkipDatabase = true
 	}
 
+	// default to port 3000
+	srcInfo.Port = 3000
+
 	// While redundant and requires dual matenance, it has been a point of
 	// confusion for many when the framework detected is listed as "NodeJS"
 	// See flyapps/dockerfile-node for the actual framework detction.
@@ -191,6 +193,7 @@ func configureJsFramework(sourceDir string, config *ScannerConfig) (*SourceInfo,
 		srcInfo.Family = "AdonisJS"
 	} else if deps["gatsby"] != nil {
 		srcInfo.Family = "Gatsby"
+		srcInfo.Port = 8080
 	} else if deps["@nestjs/core"] != nil {
 		srcInfo.Family = "NestJS"
 	} else if deps["next"] != nil {
@@ -345,21 +348,6 @@ func JsFrameworkCallback(appName string, srcInfo *SourceInfo, plan *plan.LaunchP
 	}
 	srcInfo.Family = family
 
-	// extract port
-	port := 3000
-	re = regexp.MustCompile(`(?m)^EXPOSE\s+(?P<port>\d+)`)
-	m = re.FindStringSubmatch(string(dockerfile))
-
-	for i, name := range re.SubexpNames() {
-		if len(m) > 0 && name == "port" {
-			port, err = strconv.Atoi(m[i])
-			if err != nil {
-				panic(err)
-			}
-		}
-	}
-	srcInfo.Port = port
-
 	// provide some advice
 	srcInfo.DeployDocs += fmt.Sprintf(`
 If you need custom packages installed, or have problems with your deployment

scanner/rails.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -73,6 +72,7 @@ func configureRails(sourceDir string, config *ScannerConfig) (*SourceInfo, error
 	s := &SourceInfo{
 		Family:               "Rails",
 		Callback:             RailsCallback,
+		Port:                 3000,
 		ConsoleCommand:       "/rails/bin/rails console",
 		AutoInstrumentErrors: true,
 	}
@@ -282,24 +282,9 @@ func RailsCallback(appName string, srcInfo *SourceInfo, plan *plan.LaunchPlan) e
 		return errors.Wrap(err, "Dockerfile not found")
 	}
 
-	// extract port
-	port := 3000
-	re := regexp.MustCompile(`(?m)^EXPOSE\s+(?P<port>\d+)`)
-	m := re.FindStringSubmatch(string(dockerfile))
-
-	for i, name := range re.SubexpNames() {
-		if len(m) > 0 && name == "port" {
-			port, err = strconv.Atoi(m[i])
-			if err != nil {
-				panic(err)
-			}
-		}
-	}
-	srcInfo.Port = port
-
 	// extract volume - handle both plain string and JSON format, but only allow one path
-	re = regexp.MustCompile(`(?m)^VOLUME\s+(\[\s*")?(\/[\w\/]*?(\w+))("\s*\])?\s*$`)
-	m = re.FindStringSubmatch(string(dockerfile))
+	re := regexp.MustCompile(`(?m)^VOLUME\s+(\[\s*")?(\/[\w\/]*?(\w+))("\s*\])?\s*$`)
+	m := re.FindStringSubmatch(string(dockerfile))
 
 	if len(m) > 0 {
 		srcInfo.Volumes = []Volume{